[U-Boot] [PATCH] common/fdt_support.c: Fix compile warnings
Commit a6bd9e8 "FDT: Add fixup support for multiple banks of memory"
removed code but forgot to remove the variables used by it, resulting
in warnings:
fdt_support.c: In function 'fdt_fixup_memory_banks':
fdt_support.c:399: warning: unused variable 'sizecell'
fdt_support.c:399: warning: unused variable 'addrcell'
Remove the declarations, too.
Signed-off-by: Wolfgang Denk
---
common/fdt_support.c |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/common/fdt_support.c b/common/fdt_support.c
index 90e9097..5829afd 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -396,7 +396,6 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64
size[], int banks)
int addr_cell_len, size_cell_len, len;
u8 tmp[banks * 8];
int bank;
- const u32 *addrcell, *sizecell;
err = fdt_check_header(blob);
if (err < 0) {
--
1.7.2.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] facing issue in compiling latest u-boot for P1020RDB(powerpc)
Dear Jain Priyanka-B32167, In message you wrote: > sed version on my machine is GNU 3.02 Please try updating. Tested with sed-4.2.1 (as Kumar under F13). Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "I'm growing older, but not up." - Jimmy Buffett ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] MX5: Unable to get ip address when using dhcp
Dear Jason Liu, In message <1287555088-3125-1-git-send-email-r64...@freescale.com> you wrote: > Can't get IP address with dhcp due to the dhcp server not > allow the empty param list request under some network env > > Add the advanced DHCP options to fix this issue: > > CONFIG_BOOTP_SUBNETMASK > CONFIG_BOOTP_GATEWAY > CONFIG_BOOTP_DNS > > Signed-off-by: Jason Liu Please test if Gray Remlin's patch "Fix potential empty DHCP Parameter Request List" fixes the problem for you; see http://thread.gmane.org/gmane.comp.boot-loaders.u-boot/86874 Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "Life, loathe it or ignore it, you can't like it." - Marvin the paranoid android ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] FAT: buffer overflow with FAT12/16
Dear Stefano Babic, In message <1287557505-3955-1-git-send-email-sba...@denx.de> you wrote: > Last commit 3831530dcb7b71329c272ccd6181f8038b6a6dd0a was intended > "explicitly specify FAT12/16 root directory parsing buffer size, instead > of relying on cluster size". Howver, the underlying function requires > the size of the buffer in blocks, not in bytes, and instead of passing > a double sector size a request for 1024 blocks is sent. This generates > a buffer overflow with overwriting of other structure (in the case seen, > USB structures were overwritten). > > Signed-off-by: Stefano Babic > CC: Mikhail Zolotaryov > > --- > fs/fat/fat.c |2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Nice catch! Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Never worry about theory as long as the machinery does what it's supposed to do. - R. A. Heinlein ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [RFC/PATCH] Makefile: allow boards to check file size limits
Dear Vaibhav Bedia, In message you wrote: > > Just displaying the binary size can be misleading IMHO. If the info printed > contains the complete memory requirement (stack+heap+bss) then it can > potentially save a lot of time during debugging Just run "MAKEALL" for your board and you get exactly what you are asking for, > either way, none of this is related to my patch. > > -mike > > You really need to get your quoting right. Please read http://www.netmeister.org/news/learn2quote.html > --0016e649837c8d6440049306e906 > Content-Type: text/html; charset=ISO-8859-1 > Content-Transfer-Encoding: quoted-printable And STOP posting HTML! Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "I used to think that the brain was the most wonderful organ in my body. Then I realized who was telling me this."- Emo Phillips ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 05/17] ppc: Don't initialize write protected NOR flashes
On Wednesday 20 October 2010 08:46:03 Kumar Gala wrote: > On Sep 29, 2010, at 2:05 PM, Peter Tyser wrote: > > From: John Schmoller > > > > If a NOR flash is write protected it can not be initialized/detected so > > add the ability for boards to skip NOR initialization on bootup. A > > board can skip NOR initialization by implementing the > > board_flash_wp_on() function. > > > > Signed-off-by: John Schmoller > > Signed-off-by: Peter Tyser > > CC: s...@denx.de > > --- > > arch/powerpc/lib/board.c | 16 +++- > > 1 files changed, 15 insertions(+), 1 deletions(-) > > Needs a Wolfgang or Stefan ack. Fine with me: Acked-by: Stefan Roese Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: off...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] ARM: Warning with current master
Hi after pulling the latest changes I get the following warning during linking of arm boards (I tested jadecpu and tx25). arm-unknown-eabi-ld: warning: creating a DT_TEXTREL in object. Must have something to do with the latest ELF based relocation changes but I am not an expert in these tool chain related issues to dig a bit deeper into this issue. I didn't test if the image runs on the target. gcc version is 4.3.4 Matthias ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Observation: rebasing against current master increases code size by 1.8k
Just an observation on my AT91SAM9XE based board: based on yesterday's master + arm elf relocations + my (then not mainstreamed) patches: 256288 bytes based on current master: 258020 bytes Otherwise it compiles without warnings and runs fine. Just some non-reloc-related patches have increased code size by that amount - finding out which are to "blame" is probably not worth the effort. Best Regards, Reinhard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Fix compile warning in uli526x driver
On Oct 20, 2010, at 1:56 AM, Kumar Gala wrote: > uli526x.c: In function 'uli526x_init_one': > uli526x.c:314:2: warning: dereferencing type-punned pointer will break > strict-aliasing rules > uli526x.c:314:2: warning: dereferencing type-punned pointer will break > strict-aliasing rules > > Signed-off-by: Kumar Gala > --- > drivers/net/uli526x.c |5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) applied to 85xx - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] FAT: buffer overflow with FAT12/16
Stefano,
you're right, sorry for that. Isn't it better to define LINEAR_PREFETCH_SIZE as
2 (blocks) and change get_vfatname() to something like that in such case:
__u8 *buflimit = cluster + ((curclust == 0) ?
LINEAR_PREFETCH_SIZE :
mydata->clust_size
) * SECTOR_SIZE;
Regards,
Mikhail
On 20.10.10 09:51, Stefano Babic wrote:
> Last commit 3831530dcb7b71329c272ccd6181f8038b6a6dd0a was intended
> "explicitly specify FAT12/16 root directory parsing buffer size, instead
> of relying on cluster size". Howver, the underlying function requires
> the size of the buffer in blocks, not in bytes, and instead of passing
> a double sector size a request for 1024 blocks is sent. This generates
> a buffer overflow with overwriting of other structure (in the case seen,
> USB structures were overwritten).
>
> Signed-off-by: Stefano Babic
> CC: Mikhail Zolotaryov
>
> ---
> fs/fat/fat.c |2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/fs/fat/fat.c b/fs/fat/fat.c
> index 744e961..a75e4f2 100644
> --- a/fs/fat/fat.c
> +++ b/fs/fat/fat.c
> @@ -858,7 +858,7 @@ do_fat_read (const char *filename, void *buffer, unsigned
> long maxsize,
> if (disk_read(cursect,
> (mydata->fatsize == 32) ?
> (mydata->clust_size) :
> - LINEAR_PREFETCH_SIZE,
> + LINEAR_PREFETCH_SIZE / SECTOR_SIZE,
> do_fat_read_block) < 0) {
> debug("Error: reading rootdir block\n");
> return -1;
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] sparc: add asm/unaligned.h
It isn't possible to build any sparc boards without this ... Signed-off-by: Mike Frysinger --- arch/sparc/include/asm/unaligned.h |1 + 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 arch/sparc/include/asm/unaligned.h diff --git a/arch/sparc/include/asm/unaligned.h b/arch/sparc/include/asm/unaligned.h new file mode 100644 index 000..6cecbbb --- /dev/null +++ b/arch/sparc/include/asm/unaligned.h @@ -0,0 +1 @@ +#include -- 1.7.3.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] cmd_net: drop spurious comma in U_BOOT_CMD
Building for boards that have CONFIG_CMD_CDP enabled fail with: cmd_net.c:301: error: expected expression before ',' token Signed-off-by: Mike Frysinger --- common/cmd_net.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/cmd_net.c b/common/cmd_net.c index 44d17db..b131006 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -297,7 +297,7 @@ int do_cdp (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD( cdp,1, 1, do_cdp, - "Perform CDP network configuration", + "Perform CDP network configuration" ); #endif -- 1.7.3.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] MAKEALL: drop non-existent i386 config
--- MAKEALL |4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/MAKEALL b/MAKEALL index c1f3842..febf89c 100755 --- a/MAKEALL +++ b/MAKEALL @@ -559,9 +559,7 @@ LIST_mips_el=" \ ## i386 Systems # -LIST_x86="$(boards_by_arch i386) - sc520_eNET \ -" +LIST_x86="$(boards_by_arch i386)" # ## Nios-II Systems -- 1.7.3.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] command_t: punt unused type
The recent command clean up to constify the argv option to command funcs missed the command_t type itself. This is probably because there are no build time warnings from it because no one is actually using this thing. So just punt it rather than fix it. Signed-off-by: Mike Frysinger --- include/command.h |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/include/command.h b/include/command.h index 5c14616..a153ce9 100644 --- a/include/command.h +++ b/include/command.h @@ -86,8 +86,6 @@ extern int cmd_auto_complete(const char *const prompt, char *buf, int *np, int * * void function (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); */ -typedefvoidcommand_t (cmd_tbl_t *, int, int, char *[]); - #if defined(CONFIG_CMD_MEMORY) \ || defined(CONFIG_CMD_I2C) \ || defined(CONFIG_CMD_ITEST) \ -- 1.7.3.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] do_bootm: unify duplicate prototypes
The duplication of the do_bootm prototype has gotten out of hand,
and they're pretty much all outdated (wrt constness). Unify them
all in command.h.
Signed-off-by: Mike Frysinger
---
board/barco/barco.c|1 -
board/cm5200/fwupdate.c|1 -
board/esd/common/cmd_loadpci.c |1 -
board/esd/cpci750/cpci750.c|1 -
board/esd/pci405/cmd_pci405.c |2 --
board/pn62/cmd_pn62.c |2 --
common/cmd_fdc.c |1 -
common/cmd_fdos.c |1 -
common/cmd_ide.c |1 -
common/cmd_nand.c |1 -
common/cmd_net.c |2 --
common/cmd_scsi.c |1 -
common/cmd_usb.c |1 -
include/command.h |2 ++
14 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/board/barco/barco.c b/board/barco/barco.c
index 263a288..bcf6af2 100644
--- a/board/barco/barco.c
+++ b/board/barco/barco.c
@@ -257,7 +257,6 @@ void barcobcd_boot (void)
char *bootm_args[2];
char *buf;
int cnt;
- extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
buf = (char *)(0x0080);
/* make certain there are enough chars to print the command line here!
diff --git a/board/cm5200/fwupdate.c b/board/cm5200/fwupdate.c
index c1a4a19..9d4eadc 100644
--- a/board/cm5200/fwupdate.c
+++ b/board/cm5200/fwupdate.c
@@ -35,7 +35,6 @@
#include "fwupdate.h"
-extern int do_bootm(cmd_tbl_t *, int, int, char * const []);
extern long do_fat_read(const char *, void *, unsigned long, int);
extern int do_fat_fsload(cmd_tbl_t *, int, int, char * const []);
diff --git a/board/esd/common/cmd_loadpci.c b/board/esd/common/cmd_loadpci.c
index 87da27d..8f4ad84 100644
--- a/board/esd/common/cmd_loadpci.c
+++ b/board/esd/common/cmd_loadpci.c
@@ -29,7 +29,6 @@
#if defined(CONFIG_CMD_BSP)
-extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
extern int do_source (cmd_tbl_t *, int, int, char *[]);
#define ADDRMASK 0xf000
diff --git a/board/esd/cpci750/cpci750.c b/board/esd/cpci750/cpci750.c
index f9f7c7f..f27d65e 100644
--- a/board/esd/cpci750/cpci750.c
+++ b/board/esd/cpci750/cpci750.c
@@ -122,7 +122,6 @@ static char show_config_tab[][15] = {{"PCI0DLL_2 "},
/* 31 */
extern flash_info_t flash_info[];
-extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
extern int do_bootvx (cmd_tbl_t *, int, int, char *[]);
/* - */
diff --git a/board/esd/pci405/cmd_pci405.c b/board/esd/pci405/cmd_pci405.c
index 2fc9fda..13f9019 100644
--- a/board/esd/pci405/cmd_pci405.c
+++ b/board/esd/pci405/cmd_pci405.c
@@ -34,8 +34,6 @@
#if defined(CONFIG_CMD_BSP)
-extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
-
/*
* Command loadpci: wait for signal from host and boot image.
*/
diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c
index 58c680b..939cb4a 100644
--- a/board/pn62/cmd_pn62.c
+++ b/board/pn62/cmd_pn62.c
@@ -31,8 +31,6 @@
#if defined(CONFIG_CMD_BSP)
-extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
-
/*
* Command led: controls the various LEDs 0..11 on the PN62 card.
*/
diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c
index 831a07f..cdb050c 100644
--- a/common/cmd_fdc.c
+++ b/common/cmd_fdc.c
@@ -826,7 +826,6 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char
* const argv[])
/* Check if we should attempt an auto-start */
if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
char *local_args[2];
- extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
local_args[0] = argv[0];
local_args[1] = NULL;
diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c
index a8822d9..2af4ca0 100644
--- a/common/cmd_fdos.c
+++ b/common/cmd_fdos.c
@@ -101,7 +101,6 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char
* const argv[])
/* Check if we should attempt an auto-start */
if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
char *local_args[2];
- extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
local_args[0] = argv[0];
local_args[1] = NULL;
printf ("Automatic boot of image at addr 0x%08lX ...\n", load_addr);
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index ea0f4a7..df7bdf5 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -498,7 +498,6 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char
* const argv[])
/* Check if we should attempt an auto-start */
if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
char *local_args[2];
- extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
local_args[0] = argv[0];
local_args[1] = NULL;
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 634d036..6783645 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.
[U-Boot] [PATCH] do_bootd: unify duplicate prototypes
Signed-off-by: Mike Frysinger
---
common/hush.c |4
common/main.c |2 --
include/command.h |3 +++
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/common/hush.c b/common/hush.c
index 4dd9513..2482506 100644
--- a/common/hush.c
+++ b/common/hush.c
@@ -93,8 +93,6 @@
#include /* readline */
#include
#include /* find_cmd */
-/*cmd_boot.c*/
-extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char * const
argv[]); /* do_bootd */
#endif
#ifndef __U_BOOT__
#include /* isalpha, isdigit */
@@ -1681,8 +1679,6 @@ static int run_pipe_real(struct pipe *pi)
} else {
int rcode;
#if defined(CONFIG_CMD_BOOTD)
- extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[]);
-
/* avoid "bootd" recursion */
if (cmdtp->cmd == do_bootd) {
if (flag & CMD_FLAG_BOOTD) {
diff --git a/common/main.c b/common/main.c
index d97ccd7..bbb208b 100644
--- a/common/main.c
+++ b/common/main.c
@@ -54,8 +54,6 @@ void show_boot_progress (int val) __attribute__((weak,
alias("__show_boot_progre
extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const
argv[]); /* for do_reset() prototype */
#endif
-extern int do_bootd (cmd_tbl_t *cmdtp, int flag, int argc, char * const
argv[]);
-
#if defined(CONFIG_UPDATE_TFTP)
void update_tftp (void);
#endif /* CONFIG_UPDATE_TFTP */
diff --git a/include/command.h b/include/command.h
index 7cebf8a..72eab9d 100644
--- a/include/command.h
+++ b/include/command.h
@@ -95,6 +95,9 @@ extern int cmd_auto_complete(const char *const prompt, char
*buf, int *np, int *
extern int cmd_get_data_size(char* arg, int default_size);
#endif
+#ifdef CONFIG_CMD_BOOTD
+extern int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
+#endif
extern int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
#endif /* __ASSEMBLY__ */
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] do_reset: unify duplicate prototypes
The duplication of the do_reset prototype has gotten out of hand,
and they're not all in sync. Unify them all in command.h.
Signed-off-by: Mike Frysinger
---
api/api.c |3 ---
arch/m68k/cpu/mcf5227x/cpu.c |2 +-
arch/m68k/cpu/mcf523x/cpu.c|2 +-
arch/m68k/cpu/mcf52x2/cpu.c| 14 +++---
arch/m68k/cpu/mcf532x/cpu.c|2 +-
arch/m68k/cpu/mcf5445x/cpu.c |2 +-
arch/m68k/cpu/mcf547x_8x/cpu.c |2 +-
arch/nios2/cpu/cpu.c |2 +-
arch/powerpc/cpu/mpc85xx/cpu.c |2 +-
arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c |1 -
arch/powerpc/lib/bootm.c |1 -
board/eltec/bab7xx/bab7xx.c|3 ++-
board/esd/apc405/apc405.c |1 -
board/esd/ar405/ar405.c|2 --
board/esd/ash405/ash405.c |1 -
board/esd/canbt/canbt.c|4
board/esd/cpci405/cpci405.c|1 -
board/esd/cpciiser4/cpciiser4.c|3 ---
board/esd/du405/du405.c|3 ---
board/esd/hh405/hh405.c|1 -
board/esd/pci405/pci405.c |1 -
board/esd/plu405/plu405.c |1 -
board/esd/tasreg/tasreg.c |1 -
board/esd/voh405/voh405.c |1 -
board/esd/wuh405/wuh405.c |2 --
board/freescale/m5249evb/m5249evb.c|4
board/funkwerk/vovpn-gw/vovpn-gw.c |2 +-
board/prodrive/pdnb3/pdnb3.c |3 ---
board/sacsng/sacsng.c |2 --
.../xilinx/microblaze-generic/microblaze-generic.c |3 ++-
board/zeus/zeus.c |1 -
common/cmd_boot.c |2 --
common/cmd_bootm.c |1 -
common/hush.c |4 +---
common/main.c |4
include/command.h |1 +
include/exports.h |1 -
lib/vsprintf.c |2 --
38 files changed, 21 insertions(+), 67 deletions(-)
diff --git a/api/api.c b/api/api.c
index 190ee6a..853f010 100644
--- a/api/api.c
+++ b/api/api.c
@@ -36,9 +36,6 @@
#define DEBUG
#undef DEBUG
-/* U-Boot routines needed */
-extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char * const
argv[]);
-
/*
*
* This is the API core.
diff --git a/arch/m68k/cpu/mcf5227x/cpu.c b/arch/m68k/cpu/mcf5227x/cpu.c
index 5129a03..09ef1d2 100644
--- a/arch/m68k/cpu/mcf5227x/cpu.c
+++ b/arch/m68k/cpu/mcf5227x/cpu.c
@@ -33,7 +33,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char * const
argv[])
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
volatile rcm_t *rcm = (rcm_t *) (MMAP_RCM);
udelay(1000);
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index 582aec9..2376f97 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -34,7 +34,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char * const
argv[])
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
volatile ccm_t *ccm = (ccm_t *) MMAP_CCM;
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 9fb717c..d43ef2a 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -38,7 +38,7 @@
DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_M5208
-int do_reset(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char * const
argv[])
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
volatile rcm_t *rcm = (rcm_t *)(MMAP_RCM);
@@ -142,7 +142,7 @@ int checkcpu(void)
return 0;
}
-int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char * const
argv[])
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
/* Call the board specific reset actions first. */
if(board_reset) {
@@ -177,7 +177,7 @@ int watchdog_init(void)
#endif
#ifdef CONFIG_M5272
-int do_reset(cmd_tbl_t * cmdtp, bd_t * bd, int flag, int argc, char * const
argv[])
+int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
volatile wdog_t *wdp = (wdog_t *) (MMAP_WDOG);
@@ -257,7 +257,7 @@ int watchdog_init(void)
#endif /* #ifdef CONFIG_M5272 */
Re: [U-Boot] Observation: rebasing against current master increases code size by 1.8k
On Wednesday, October 20, 2010 03:30:33 Reinhard Meyer wrote: > Just an observation on my AT91SAM9XE based board: > > based on yesterday's master + arm elf relocations + > my (then not mainstreamed) patches: 256288 bytes > > based on current master: 258020 bytes > > Otherwise it compiles without warnings and runs fine. > Just some non-reloc-related patches have increased > code size by that amount - finding out which are to > "blame" is probably not worth the effort. look at the env change ? ea882baf9c17cd142c99e3ff640d3ab01daa5cec -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-mpc85xx.git
The following changes since commit 11c8dd36edcc82564a19dbd0103302df66d66db0:
FAT: buffer overflow with FAT12/16 (2010-10-20 09:14:38 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-mpc85xx master
Aaron Sierra (1):
85xx: Add support for not releasing secondary cores via 'mp_holdoff'
Kumar Gala (4):
powerpc/fsl: Introduce common enum for PHY types
powerpc/8xxx: Add fdt_fixup_phy_connection helper
86xx: Create common linker script
Fix compile warning in uli526x driver
Peter Tyser (6):
mpc8641hpcn: Update PCI code
sbc8641d: Update PCI code
tqm85xx: Update PCI code
mpc8640: Update the io_sel fields for PCI Express
86xx: Use gc-sections to reduce image size
85xx: Use gc-sections to reduce image size
Timur Tabi (1):
always relocate fdt into an lmb-allocated memory block
York Sun (7):
Adding more control to physical address mapping
Add memory test feature for mpc85xx POST.
Setup POST word for generic mpc85xx
Enable POST memory test for corenet_ds
Enable POST memory test for P2020DS
Adding fixed sdram setting for cornet_ds board
Disable unused chip-select for DDR controller interleaving
arch/powerpc/cpu/mpc85xx/config.mk |4 +
arch/powerpc/cpu/mpc85xx/cpu.c | 219
arch/powerpc/cpu/mpc85xx/fdt.c | 22 +-
arch/powerpc/cpu/mpc85xx/mp.c | 31 ++
arch/powerpc/cpu/mpc85xx/mp.h |1 +
arch/powerpc/cpu/mpc85xx/tlb.c | 16 +-
arch/powerpc/cpu/mpc85xx/u-boot.lds| 52 +---
arch/powerpc/cpu/mpc86xx/config.mk |7 +
.../powerpc/cpu/mpc86xx}/u-boot.lds| 26 +-
arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c | 17 +-
arch/powerpc/cpu/mpc8xxx/fdt.c | 24 ++
arch/powerpc/cpu/mpc8xxx/pci_cfg.c |5 +-
arch/powerpc/include/asm/fsl_ddr_sdram.h |6 +
arch/powerpc/include/asm/fsl_enet.h| 33 ++
board/freescale/corenet_ds/Makefile|3 +-
board/freescale/corenet_ds/corenet_ds.c| 15 -
board/freescale/corenet_ds/ddr.c | 131 +++-
board/freescale/corenet_ds/p4080ds_ddr.c | 356
board/freescale/mpc8360emds/mpc8360emds.c | 15 +-
board/freescale/mpc837xemds/mpc837xemds.c |8 +-
board/freescale/mpc8569mds/mpc8569mds.c|4 +-
board/freescale/mpc8610hpcd/u-boot.lds | 132
board/freescale/mpc8641hpcn/mpc8641hpcn.c | 97 ++
board/freescale/mpc8641hpcn/u-boot.lds | 133
board/sbc8641d/sbc8641d.c | 103 ++-
board/tqc/tqm85xx/law.c|4 +-
board/tqc/tqm85xx/tlb.c| 10 +-
board/tqc/tqm85xx/tqm85xx.c| 151 +++--
board/xes/xpedite5170/u-boot.lds | 132
common/image.c | 83 ++---
doc/README.fsl-ddr | 14 +
drivers/net/uli526x.c |5 +-
drivers/qe/uec.c | 10 +-
drivers/qe/uec.h | 20 +-
drivers/qe/uec_phy.c |8 +-
include/configs/P2020DS.h |5 +-
include/configs/TQM85xx.h | 20 +-
include/configs/corenet_ds.h | 61 +
include/post.h |4 +-
39 files changed, 1059 insertions(+), 928 deletions(-)
rename {board/sbc8641d => arch/powerpc/cpu/mpc86xx}/u-boot.lds (90%)
create mode 100644 arch/powerpc/include/asm/fsl_enet.h
create mode 100644 board/freescale/corenet_ds/p4080ds_ddr.c
delete mode 100644 board/freescale/mpc8610hpcd/u-boot.lds
delete mode 100644 board/freescale/mpc8641hpcn/u-boot.lds
delete mode 100644 board/xes/xpedite5170/u-boot.lds
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] kirkwood: Fix Makefile TEXT_BASE for mkimage
On Wednesday, October 20, 2010 02:03:10 Prafulla Wadaskar wrote: > Hi Gray please dont top post > It will be great if you put some comments too. > That to describe patch objective Wolfgang recently cleaned up TEXT_BASE so it no longer exists -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] ARM: Warning with current master
Le 20/10/2010 09:22, Matthias Weißer a écrit : > Hi > > after pulling the latest changes I get the following warning during > linking of arm boards (I tested jadecpu and tx25). > > arm-unknown-eabi-ld: warning: creating a DT_TEXTREL in object. Hmm... Which toolchain do you use? Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] autocomplete: remove runtime handler install
Rather than add runtime overhead of installing completion handlers, do it
statically at build time. This requires a new build time helper macro to
declare a command and the completion handler at the same time. Then we
convert the env related funcs over to this.
This gives an opportunity to also unify the U_BOOT_CMD macros.
Signed-off-by: Mike Frysinger
---
common/cmd_nvedit.c | 20
common/command.c| 24
common/main.c |4
include/command.h | 30 ++
4 files changed, 30 insertions(+), 48 deletions(-)
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 3d30c32..be7a878 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -886,29 +886,32 @@ U_BOOT_CMD(
*/
#if defined(CONFIG_CMD_EDITENV)
-U_BOOT_CMD(
+U_BOOT_CMD_COMPLETE(
editenv, 2, 0, do_env_edit,
"edit environment variable",
"name\n"
- "- edit environment variable 'name'"
+ "- edit environment variable 'name'",
+ var_complete
);
#endif
-U_BOOT_CMD(
+U_BOOT_CMD_COMPLETE(
printenv, CONFIG_SYS_MAXARGS, 1,do_env_print,
"print environment variables",
"\n- print values of all environment variables\n"
"printenv name ...\n"
- "- print value of environment variable 'name'"
+ "- print value of environment variable 'name'",
+ var_complete
);
-U_BOOT_CMD(
+U_BOOT_CMD_COMPLETE(
setenv, CONFIG_SYS_MAXARGS, 0, do_env_set,
"set environment variables",
"name value ...\n"
"- set environment variable 'name' to 'value ...'\n"
"setenv name\n"
- "- delete environment variable 'name'"
+ "- delete environment variable 'name'",
+ var_complete
);
#if defined(CONFIG_CMD_ASKENV)
@@ -929,10 +932,11 @@ U_BOOT_CMD(
#endif
#if defined(CONFIG_CMD_RUN)
-U_BOOT_CMD(
+U_BOOT_CMD_COMPLETE(
run,CONFIG_SYS_MAXARGS, 1, do_run,
"run commands in an environment variable",
"var [...]\n"
- "- run the commands in the environment variable(s) 'var'"
+ "- run the commands in the environment variable(s) 'var'",
+ var_complete
);
#endif
diff --git a/common/command.c b/common/command.c
index d47d719..f975701 100644
--- a/common/command.c
+++ b/common/command.c
@@ -175,30 +175,6 @@ int var_complete(int argc, char * const argv[], char
last_char, int maxv, char *
return 0;
}
-static void install_auto_complete_handler(const char *cmd,
- int (*complete)(int argc, char * const argv[], char last_char,
int maxv, char *cmdv[]))
-{
- cmd_tbl_t *cmdtp;
-
- cmdtp = find_cmd(cmd);
- if (cmdtp == NULL)
- return;
-
- cmdtp->complete = complete;
-}
-
-void install_auto_complete(void)
-{
-#if defined(CONFIG_CMD_EDITENV)
- install_auto_complete_handler("editenv", var_complete);
-#endif
- install_auto_complete_handler("printenv", var_complete);
- install_auto_complete_handler("setenv", var_complete);
-#if defined(CONFIG_CMD_RUN)
- install_auto_complete_handler("run", var_complete);
-#endif
-}
-
/*/
static int complete_cmdv(int argc, char * const argv[], char last_char, int
maxv, char *cmdv[])
diff --git a/common/main.c b/common/main.c
index 878cffd..42f4d02 100644
--- a/common/main.c
+++ b/common/main.c
@@ -336,10 +336,6 @@ void main_loop (void)
hush_init_var ();
#endif
-#ifdef CONFIG_AUTO_COMPLETE
- install_auto_complete();
-#endif
-
#ifdef CONFIG_PREBOOT
if ((p = getenv ("preboot")) != NULL) {
# ifdef CONFIG_AUTOBOOT_KEYED
diff --git a/include/command.h b/include/command.h
index 81aa019..d1a0fc0 100644
--- a/include/command.h
+++ b/include/command.h
@@ -74,7 +74,7 @@ cmd_tbl_t *find_cmd_tbl (const char *cmd, cmd_tbl_t *table,
int table_len);
extern int cmd_usage(cmd_tbl_t *cmdtp);
#ifdef CONFIG_AUTO_COMPLETE
-extern void install_auto_complete(void);
+extern int var_complete(int argc, char * const argv[], char last_char, int
maxv, char *cmdv[]);
extern int cmd_auto_complete(const char *const prompt, char *buf, int *np, int
*colp);
#endif
@@ -111,23 +111,29 @@ extern int do_reset(cmd_tbl_t *cmdtp, int flag, int argc,
char * const argv[]);
#define Struct_Section __attribute__ ((unused,section (".u_boot_cmd")))
-#ifdef CONFIG_SYS_LONGHELP
+#ifdef CONFIG_AUTO_COMPLETE
+# define _CMD_COMPLETE(x) x,
+#else
+# define _CMD_COMPLETE(x)
+#endif
+#ifdef CONFIG_SYS_LONGHELP
+# define _CMD_HELP(x) x,
+#else
+# define _CMD_HELP(x)
+#endif
-#define U_BOOT_CMD(name,maxargs,rep,cmd,usage,help) \
-cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd,
usage, help}
+#define U_BOOT_CMD_MKENT_COMPLETE(name,maxargs,rep,cmd,usage,help,comp) \
+ {#name, maxargs, rep, cmd, usage, _CMD_HELP(help) _CMD_COMPLETE
Re: [U-Boot] ARM: Warning with current master
Am 20.10.2010 09:44, schrieb Albert ARIBAUD: > Le 20/10/2010 09:22, Matthias Weißer a écrit : >> Hi >> >> after pulling the latest changes I get the following warning during >> linking of arm boards (I tested jadecpu and tx25). >> >> arm-unknown-eabi-ld: warning: creating a DT_TEXTREL in object. > > Hmm... Which toolchain do you use? I build it myself using crosstools-ng $ arm-unknown-eabi-gcc -v Using built-in specs. Target: arm-unknown-eabi Configured with: ~/ctdev/targets/src/gcc-4.3.4/configure --build=i686-build_pc-linux-gnu --host=i686-build_pc-linux-gnu --target=arm-unknown-eabi --prefix=~/x-tools/arm-unknown-eabi --with-local-prefix=~/x-tools/arm-unknown-eabi/arm-unknown-eabi//sys-root --disable-multilib --disable-libmudflap --with-sysroot=~/x-tools/arm-unknown-eabi/arm-unknown-eabi//sys-root --with-newlib --enable-threads=no --disable-shared --with-pkgversion=crosstool-NG-1.8.0 --disable-__cxa_atexit --with-gmp=~/ctdev/targets/arm-unknown-eabi/build/static --with-mpfr=~/ctdev/targets/arm-unknown-eabi/build/static --enable-target-optspace --disable-nls --enable-symvers=gnu --enable-languages=c,c++ Thread model: single gcc version 4.3.4 (crosstool-NG-1.8.0) Hope this helps. Matthias ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] hi，all
Dear All: A newbie post the first email. Best Regards ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Observation: rebasing against current master increases code size by 1.8k
Dear Mike Frysinger, > On Wednesday, October 20, 2010 03:30:33 Reinhard Meyer wrote: >> Just an observation on my AT91SAM9XE based board: >> >> based on yesterday's master + arm elf relocations + >> my (then not mainstreamed) patches: 256288 bytes >> >> based on current master: 258020 bytes >> >> Otherwise it compiles without warnings and runs fine. >> Just some non-reloc-related patches have increased >> code size by that amount - finding out which are to >> "blame" is probably not worth the effort. > > look at the env change ? > ea882baf9c17cd142c99e3ff640d3ab01daa5cec That (old) commit was in mainstream already. Related fixups do not matter for my board since env_mmc ist not included and ARM_RELOC_FIXUP_WORKS is set. Reinhard ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/5] New environment code
On Saturday, July 17, 2010 15:45:43 Wolfgang Denk wrote: > The following patch series adds some utilities (qsort and hash table > based database functions) and uses these to reimplement the code used > for the internal handling of environment variables. seems to break autocompletion CONFIG_AUTO_COMPLETE :( if i checkout the previous commit (0fe247b973d9b8f7e2c04cc159fcdd2e64591e55), things work fine. but checking out the env change and it no longer works. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Observation: rebasing against current master increases code size by 1.8k
On Wednesday, October 20, 2010 04:02:26 Reinhard Meyer wrote: > Mike Frysinger wrote: > > On Wednesday, October 20, 2010 03:30:33 Reinhard Meyer wrote: > >> Just an observation on my AT91SAM9XE based board: > >> > >> based on yesterday's master + arm elf relocations + > >> my (then not mainstreamed) patches: 256288 bytes > >> > >> based on current master: 258020 bytes > >> > >> Otherwise it compiles without warnings and runs fine. > >> Just some non-reloc-related patches have increased > >> code size by that amount - finding out which are to > >> "blame" is probably not worth the effort. > > > > look at the env change ? > > > > ea882baf9c17cd142c99e3ff640d3ab01daa5cec > > That (old) commit was in mainstream already. Related fixups > do not matter for my board since env_mmc ist not included > and ARM_RELOC_FIXUP_WORKS is set. it isnt old. it was *committed* a while ago, but wasnt *merged* into mainline until after the latest release (v2010.09). so it's new to the master branch. that's the only common code change that pops into my mind after the v2010.09 release was made. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] ARM: Warning with current master
Dear =?ISO-8859-15?Q?Matthias_Wei=DFer?=, In message <4cbe98a1.9020...@arcor.de> you wrote: > > after pulling the latest changes I get the following warning during > linking of arm boards (I tested jadecpu and tx25). > > arm-unknown-eabi-ld: warning: creating a DT_TEXTREL in object. Which exact tool chain is this? > Must have something to do with the latest ELF based relocation changes > but I am not an expert in these tool chain related issues to dig a bit > deeper into this issue. Building with ELDK 4.2 works fine: -> ./MAKEALL jadecpu tx25 Configuring for jadecpu board... textdata bss dec hex filename 197763 19360 266416 483539 760d3 ./u-boot Configuring for tx25 board... textdata bss dec hex filename 1587188668 37120 204506 31eda ./u-boot - SUMMARY Boards compiled: 2 -- Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de The world is no nursery. - Sigmund Freud ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 0/5] New environment code
Dear Mike Frysinger, In message <201010200408.15020.vap...@gentoo.org> you wrote: > > > The following patch series adds some utilities (qsort and hash table > > based database functions) and uses these to reimplement the code used > > for the internal handling of environment variables. > > seems to break autocompletion CONFIG_AUTO_COMPLETE :( Yes, this was already noted and discussed before. I'm still not sure how to (re-) add this optimally. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de It became apparent that one reason why the Ice Giants were known as the Ice Giants was because they were, well, giants. The other was that they were made of ice. -Terry Pratchett, _Sourcery_ ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Notification in Malloc
Hi, During some tests with the u-boot-2010.09 source release, I discovered that when invoking malloc with size 0, the code proceeds and corrupts the malloc structures, thus totally breaking the malloc invocations from then on (malloc will always fail after that). The cause of my problem was a burned flash chip, that returned 0 in regions, in the "cfi_mtd_set_erasesize" call. My solution was to modify the first check of malloc, in order not to freeze when there was an error on the requested space. New condition includes the equal as well as the less: if ((long)bytes <= 0) return 0; This seems to fix the problems, after the malloc invocation with size 0. If there is another way to deal with this, plz keep me posted. Thanks, Nik ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] MAKEALL: drop non-existent i386 config
On Wednesday, October 20, 2010, Mike Frysinger wrote: > --- > MAKEALL | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/MAKEALL b/MAKEALL > index c1f3842..febf89c 100755 > --- a/MAKEALL > +++ b/MAKEALL > @@ -559,9 +559,7 @@ LIST_mips_el=" \ > ## i386 Systems > # > > -LIST_x86="$(boards_by_arch i386) > - sc520_eNET \ > -" > +LIST_x86="$(boards_by_arch i386)" > Thanks Mike. I won't get a chance to test this until next week though RL needs more attention ATM :) Regards, Graeme ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] facing issue in compiling latest u-boot for P1020RDB(powerpc)
Thanks Dear Wolfgang Denk and Dear Kumar Gala, I was able to solve compilation error by upgrading sed. Regards Priyanka -Original Message- From: Wolfgang Denk [mailto:w...@denx.de] Sent: Wednesday, October 20, 2010 12:35 PM To: Jain Priyanka-B32167 Cc: Kumar Gala; u-boot@lists.denx.de Subject: Re: [U-Boot] facing issue in compiling latest u-boot for P1020RDB(powerpc) Dear Jain Priyanka-B32167, In message you wrote: > sed version on my machine is GNU 3.02 Please try updating. Tested with sed-4.2.1 (as Kumar under F13). Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "I'm growing older, but not up." - Jimmy Buffett ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc4xx: Add Io and IoCon 405EP board support
Hi Dirk, On Thursday 14 October 2010 11:59:10 Dirk Eibach wrote: > Board support for the Guntermann & Drunck CATCenter Io. > Board support for the Guntermann & Drunck IoCon. I just tried to apply this patch, but it doesn't work: [ste...@quad u-boot-ppc4xx (master)]$ git am -3 -s patches_update-2010-10-20/\[U-Boot\]\ \[PATCH\]\ ppc4xx_Add\ Io\ and\ IoCon\ 405EP\ board\ support.mbox Applying: ppc4xx: Add Io and IoCon 405EP board support Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging MAINTAINERS Auto-merging MAKEALL CONFLICT (content): Merge conflict in MAKEALL Auto-merging boards.cfg CONFLICT (content): Merge conflict in boards.cfg Failed to merge in the changes. I tried to manually resolve these conflicts but stumbled over other problems with this patch resulting from the latest changes in the MAKEALL rework done by Wolfgang. You need to remove your config.mk file and add CONFIG_SYS_TEXT_BASE to your board config headers now. Please fix (rebase on current u-boot master) and resubmit. Thanks. Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: off...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc4xx: Change tsr/tcr macros to upper case
On Monday 04 October 2010 11:09:40 Stefan Roese wrote: > Remove uneccessary functions to access the TCR/TSR registers as well. Applied to u-boot-ppc4xx/master. Thanks. Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: off...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc4xx/POST: Add board specific UART POST test to lwmon5
On Thursday 07 October 2010 14:16:25 Stefan Roese wrote: > Add CONFIG_POST_UART to implement a board specific UART POST test. > This is done since lwmon5 needs to set POST_ALWAYS to run this > test on each reboot. And we don't want to change the default > behavious of this this. Applied to u-boot-ppc4xx/master. Thanks. Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: off...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc4xx: Enable NOR flash support in sequoia_ramboot target
On Monday 11 October 2010 15:50:10 Stefan Roese wrote: > Until now, the Sequoia RAM-booting image disabled NOR flash support > as this image was mainly created for NAND-only boards. This patch > now enables NOR flash support for this RAM-booting version as well. Applied to u-boot-ppc4xx/master. Thanks. Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: off...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ppc4xx: Fix default environment for AMCC boards
On Friday 15 October 2010 08:41:01 Stefan Roese wrote: > Commit 0ad7f0950a9bc0a69b3cd5f34ccf7da25fcf1c6d [ppc4xx: cleanup > default environment for AMCC boards] broke the default env for > many PPC4xx boards. The '\0' character got removed at the end > of some environment commands like "update". This patch adds the > missing '\0' characters again. Applied to u-boot-ppc4xx/master. Thanks. Cheers, Stefan -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: off...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Please pull u-boot-ppc4xx/master
The following changes since commit 11c8dd36edcc82564a19dbd0103302df66d66db0: FAT: buffer overflow with FAT12/16 (2010-10-20 09:14:38 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git master Stefan Roese (4): ppc4xx: Change tsr/tcr macros to upper case ppc4xx/POST: Add board specific UART POST test to lwmon5 ppc4xx: Enable NOR flash support in sequoia_ramboot target ppc4xx: Fix default environment for AMCC boards arch/powerpc/cpu/ppc4xx/cpu_init.c |8 arch/powerpc/cpu/ppc4xx/interrupts.c |7 --- arch/powerpc/cpu/ppc4xx/traps.c | 11 +-- board/amcc/sequoia/sequoia.c |6 -- include/configs/amcc-common.h| 15 ++- include/configs/lwmon5.h | 11 +++ post/tests.c |4 7 files changed, 26 insertions(+), 36 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH][v0] RTC driver for PT7C4338 chip.
PT7C4338 chip is manufactured by Pericom Technology Inc.
It is a serial real-time clock which provides:
1)Low-power clock/calendar.
2)Programmable square-wave output.
It has 56 bytes of nonvolatile RAM.
Freescale P1010RDB uses PT7C4338 as RTC.
Signed-off-by: Priyanka Jain
Acked-by: Timur Tabi
---
drivers/rtc/Makefile |1 +
drivers/rtc/pt7c4338.c | 161
2 files changed, 162 insertions(+), 0 deletions(-)
create mode 100644 drivers/rtc/pt7c4338.c
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 772a49a..a6dda91 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -62,6 +62,7 @@ COBJS-$(CONFIG_RTC_RX8025) += rx8025.o
COBJS-$(CONFIG_RTC_S3C24X0) += s3c24x0_rtc.o
COBJS-$(CONFIG_RTC_S3C44B0) += s3c44b0_rtc.o
COBJS-$(CONFIG_RTC_X1205) += x1205.o
+COBJS-$(CONFIG_RTC_PT7C4338) += pt7c4338.o
COBJS := $(sort $(COBJS-y))
SRCS := $(COBJS:.o=.c)
diff --git a/drivers/rtc/pt7c4338.c b/drivers/rtc/pt7c4338.c
new file mode 100644
index 000..5ce2afc
--- /dev/null
+++ b/drivers/rtc/pt7c4338.c
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2010 Freescale Semiconductor, Inc.
+ *
+ * Author: Priyanka Jain
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+
+/*
+ * This file provides Date & Time support (no alarms) for PT7C4338 chip.
+ *
+ * This file is based on drivers/rtc/ds1337.c
+ *
+ * PT7C4338 chip is manufactured by Pericom Technology Inc.
+ * It is a serial real-time clock which provides
+ * 1)Low-power clock/calendar.
+ * 2)Programmable square-wave output.
+ * It has 56 bytes of nonvolatile RAM.
+ *
+ * Freescale P1010RDB uses PT7C4338 as RTC.
+ */
+
+
+#include
+#include
+#include
+#include
+
+
+/* RTC register addresses */
+#define RTC_SEC_REG_ADDR0x0
+#define RTC_MIN_REG_ADDR0x1
+#define RTC_HR_REG_ADDR 0x2
+#define RTC_DAY_REG_ADDR0x3
+#define RTC_DATE_REG_ADDR 0x4
+#define RTC_MON_REG_ADDR0x5
+#define RTC_YR_REG_ADDR 0x6
+#define RTC_CTL_STAT_REG_ADDR 0x7
+
+/* RTC second register address bit */
+#define RTC_SEC_BIT_CH 0x80/* Clock Halt (in Register 0) */
+
+/* RTC control and status register bits */
+#define RTC_CTL_STAT_BIT_RS00x1/* Rate select 0 */
+#define RTC_CTL_STAT_BIT_RS10x2/* Rate select 1 */
+#define RTC_CTL_STAT_BIT_SQWE 0x10 /* Square Wave Enable */
+#define RTC_CTL_STAT_BIT_OSF0x20 /* Oscillator Stop Flag */
+#define RTC_CTL_STAT_BIT_OUT0x80 /* Output Level Control */
+
+/* RTC reset value */
+#define RTC_PT7C4338_RESET_VAL \
+ (RTC_CTL_STAT_BIT_RS0 | RTC_CTL_STAT_BIT_RS1 | RTC_CTL_STAT_BIT_OUT)
+
+
+/** Helper functions /
+
+static u8 rtc_read(u8 reg)
+{
+ return i2c_reg_read(CONFIG_SYS_I2C_RTC_ADDR, reg);
+}
+
+static void rtc_write(u8 reg, u8 val)
+{
+ i2c_reg_write(CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+}
+
+//
+
+
+/* Get the current time from the RTC */
+int rtc_get(struct rtc_time *tmp)
+{
+ int ret = 0;
+ u8 sec, min, hour, mday, wday, mon, year, ctl_stat;
+
+ ctl_stat = rtc_read(RTC_CTL_STAT_REG_ADDR);
+ sec = rtc_read(RTC_SEC_REG_ADDR);
+ min = rtc_read(RTC_MIN_REG_ADDR);
+ hour = rtc_read(RTC_HR_REG_ADDR);
+ wday = rtc_read(RTC_DAY_REG_ADDR);
+ mday = rtc_read(RTC_DATE_REG_ADDR);
+ mon = rtc_read(RTC_MON_REG_ADDR);
+ year = rtc_read(RTC_YR_REG_ADDR);
+ debug("Get RTC year: %02x mon: %02x mday: %02x wday: %02x "
+ "hr: %02x min: %02x sec: %02x control_status: %02x\n",
+ year, mon, mday, wday, hour, min, sec, ctl_stat);
+
+ if (ctl_stat & RTC_CTL_STAT_BIT_OSF) {
+ printf("### Warning: RTC oscillator has stopped\n");
+ /* clear the OSF flag */
+ rtc_write(RTC_CTL_STAT_REG_ADDR,
+ rtc_read(RTC_CTL_STAT_REG_ADDR)\
+ & ~RTC_CTL_STAT_BIT_OSF);
+ ret = -1;
+ }
+
+ if (sec & RTC_SEC_BIT_CH) {
+ printf("### Warning: RTC oscillator has stopped\n");
+ /* clear the CH flag */
+ rtc_wr
Re: [U-Boot] [PATCH] MAKEALL: drop non-existent i386 config
On Wednesday, October 20, 2010 04:23:18 Graeme Russ wrote: > On Wednesday, October 20, 2010, Mike Frysinger wrote: > > --- a/MAKEALL > > +++ b/MAKEALL > > -LIST_x86="$(boards_by_arch i386) > > - sc520_eNET \ > > -" > > +LIST_x86="$(boards_by_arch i386)" > > Thanks Mike. I won't get a chance to test this until next week though there isnt much to test ... `make sc520_eNET_config` returns "No rule to make target" which means this shouldnt be listed in MAKEALL or there should be a config target for this board and so there's a lot more work for you to do ... -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Blackfin: adi boards: set compiled size limits
Signed-off-by: Mike Frysinger --- include/configs/bf548-ezkit.h |1 + include/configs/bfin_adi_common.h |3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index 4412177..1c035cf 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -180,6 +180,7 @@ * Misc Settings */ #define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_SIZE_LIMIT $$(( 512 * 1024 )) #define CONFIG_RTC_BFIN #define CONFIG_UART_CONSOLE1 #define CONFIG_BFIN_SPI_IMG_SIZE 0x5 diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index 608788a..03c6433 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -295,6 +295,9 @@ /* * Misc Settings */ +#ifndef CONFIG_BOARD_SIZE_LIMIT +# define CONFIG_BOARD_SIZE_LIMIT $$(( 256 * 1024 )) +#endif #define CONFIG_BFIN_SPI_GPIO_CS /* Only matters if BFIN_SPI is enabled */ #define CONFIG_LZMA -- 1.7.3.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] USB: sync Queue Element Transfer Descriptor against EHCI spec
Hi, 2010/10/20 Wolfgang Denk : > > In message <1287497595-22758-1-git-send-email...@denx.de> I wrote: >> Appendix B "EHCI 64-Bit Data Structures" of the "Enhanced Host >> Controller Interface Specification for Universal Serial Bus" (Rev. >> 1.0, March 12, 2002) defines additional fields which were missing in >> U-Boot's struct qTD; as these are also present in recent versions of >> struct ehci_qtd in the Linux kernel, we add them here, too. >> >> This fixes some nasty memory corruption problems. >> >> Reported-by: Dan Lykowski >> See http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/76942 >> >> Signed-off-by: Wolfgang Denk >> Cc: Remy Bohmer >> Cc: Dan Lykowski >> Cc: Stefano Babic >> Tested-by: Stefano Babic > > Applied directly. > > Remy, I hope this is OK with you. You seem to be in a hurry... Patch is OK... Remy ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH][v0] RTC driver for PT7C4338 chip.
Hello Priyanka,
Priyanka Jain wrote:
> PT7C4338 chip is manufactured by Pericom Technology Inc.
> It is a serial real-time clock which provides:
> 1)Low-power clock/calendar.
> 2)Programmable square-wave output.
> It has 56 bytes of nonvolatile RAM.
>
> Freescale P1010RDB uses PT7C4338 as RTC.
>
> Signed-off-by: Priyanka Jain
> Acked-by: Timur Tabi
> ---
> drivers/rtc/Makefile |1 +
> drivers/rtc/pt7c4338.c | 161
>
> 2 files changed, 162 insertions(+), 0 deletions(-)
> create mode 100644 drivers/rtc/pt7c4338.c
just some nitpicking comments.
> diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
> index 772a49a..a6dda91 100644
> --- a/drivers/rtc/Makefile
> +++ b/drivers/rtc/Makefile
> @@ -62,6 +62,7 @@ COBJS-$(CONFIG_RTC_RX8025) += rx8025.o
> COBJS-$(CONFIG_RTC_S3C24X0) += s3c24x0_rtc.o
> COBJS-$(CONFIG_RTC_S3C44B0) += s3c44b0_rtc.o
> COBJS-$(CONFIG_RTC_X1205) += x1205.o
> +COBJS-$(CONFIG_RTC_PT7C4338) += pt7c4338.o
please keep lists sorted.
> COBJS:= $(sort $(COBJS-y))
> SRCS := $(COBJS:.o=.c)
> diff --git a/drivers/rtc/pt7c4338.c b/drivers/rtc/pt7c4338.c
> new file mode 100644
> index 000..5ce2afc
> --- /dev/null
> +++ b/drivers/rtc/pt7c4338.c
> @@ -0,0 +1,161 @@
> +/*
> + * Copyright 2010 Freescale Semiconductor, Inc.
> + *
> + * Author: Priyanka Jain
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License as
> + * published by the Free Software Foundation; either version 2 of
> + * the License, or (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> + * MA 02111-1307 USA
> + */
> +
> +
only one new line.
> +/*
> + * This file provides Date & Time support (no alarms) for PT7C4338 chip.
> + *
> + * This file is based on drivers/rtc/ds1337.c
> + *
> + * PT7C4338 chip is manufactured by Pericom Technology Inc.
> + * It is a serial real-time clock which provides
> + * 1)Low-power clock/calendar.
> + * 2)Programmable square-wave output.
> + * It has 56 bytes of nonvolatile RAM.
> + *
> + * Freescale P1010RDB uses PT7C4338 as RTC.
> + */
> +
> +
here too, only one new line.
> +#include
> +#include
> +#include
> +#include
> +
> +
and here too.
> +/* RTC register addresses */
> +#define RTC_SEC_REG_ADDR0x0
> +#define RTC_MIN_REG_ADDR0x1
> +#define RTC_HR_REG_ADDR 0x2
> +#define RTC_DAY_REG_ADDR0x3
> +#define RTC_DATE_REG_ADDR 0x4
> +#define RTC_MON_REG_ADDR0x5
> +#define RTC_YR_REG_ADDR 0x6
> +#define RTC_CTL_STAT_REG_ADDR 0x7
> +
> +/* RTC second register address bit */
> +#define RTC_SEC_BIT_CH 0x80/* Clock Halt (in Register 0) */
> +
> +/* RTC control and status register bits */
> +#define RTC_CTL_STAT_BIT_RS00x1 /* Rate select 0 */
> +#define RTC_CTL_STAT_BIT_RS10x2 /* Rate select 1 */
> +#define RTC_CTL_STAT_BIT_SQWE 0x10 /* Square Wave Enable */
> +#define RTC_CTL_STAT_BIT_OSF0x20 /* Oscillator Stop Flag */
> +#define RTC_CTL_STAT_BIT_OUT0x80 /* Output Level Control */
> +
> +/* RTC reset value */
> +#define RTC_PT7C4338_RESET_VAL \
> + (RTC_CTL_STAT_BIT_RS0 | RTC_CTL_STAT_BIT_RS1 | RTC_CTL_STAT_BIT_OUT)
> +
> +
and here too.
> +/** Helper functions /
> +
no new line needed.
> +static u8 rtc_read(u8 reg)
> +{
> + return i2c_reg_read(CONFIG_SYS_I2C_RTC_ADDR, reg);
> +}
[...]
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] [PATCH v4 00/01] NDS32: Add NDS32 architecture support to u-boot.
NDS32 is a new 32-bit RISC architecture invented by andestech.com. It has a 16-bit/32-bit mixed-length instruction set to achieve optimal system performance, code density, and power efficiency. NDS32 also provide N9, N10, N12 different CPU core families for soft-core and hard-core SoC design. Macpaul Lin (1): nds32: add header files support for nds32 Patch v1: First commit of NDS32 arch to u-boot, add ag101, adp-ag101 into u-boot. Patch v2: Clean up for Patch v1, and reorganize code of ag101 from a320. Patch v3: Clean up for Patch v2, and reordering and reduce the size and patches. Patch v4: Clear up for Patch v3, remove code that haven't used in the system. Then commit header files only. Note: Empty headers config.h, memory.h, processor.h are necessary for compiling some device drivers. Otherwise those drivers won't be build. -- 1.7.2.2 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 01/01] nds32: add header files support for nds32
Add generic header files support for nds32 architecture.
Cache, ptregs, data type and other definitions are included.
Signed-off-by: Macpaul Lin
---
arch/nds32/include/asm/bitops.h | 150 ++
arch/nds32/include/asm/byteorder.h| 36
arch/nds32/include/asm/cache.h| 51 +
arch/nds32/include/asm/config.h | 26 +++
arch/nds32/include/asm/global_data.h | 76 +++
arch/nds32/include/asm/io.h | 345 +
arch/nds32/include/asm/mach-types.h | 29 +++
arch/nds32/include/asm/memory.h | 19 ++
arch/nds32/include/asm/posix_types.h | 84
arch/nds32/include/asm/processor.h| 25 +++
arch/nds32/include/asm/ptrace.h | 22 ++
arch/nds32/include/asm/ptregs.h | 82
arch/nds32/include/asm/string.h | 57 ++
arch/nds32/include/asm/types.h| 67 +++
arch/nds32/include/asm/u-boot-nds32.h | 47 +
arch/nds32/include/asm/u-boot.h | 69 +++
arch/nds32/include/asm/unaligned.h| 31 +++
17 files changed, 1216 insertions(+), 0 deletions(-)
create mode 100644 arch/nds32/include/asm/bitops.h
create mode 100644 arch/nds32/include/asm/byteorder.h
create mode 100644 arch/nds32/include/asm/cache.h
create mode 100644 arch/nds32/include/asm/config.h
create mode 100644 arch/nds32/include/asm/global_data.h
create mode 100644 arch/nds32/include/asm/io.h
create mode 100644 arch/nds32/include/asm/mach-types.h
create mode 100644 arch/nds32/include/asm/memory.h
create mode 100644 arch/nds32/include/asm/posix_types.h
create mode 100644 arch/nds32/include/asm/processor.h
create mode 100644 arch/nds32/include/asm/ptrace.h
create mode 100644 arch/nds32/include/asm/ptregs.h
create mode 100644 arch/nds32/include/asm/string.h
create mode 100644 arch/nds32/include/asm/types.h
create mode 100644 arch/nds32/include/asm/u-boot-nds32.h
create mode 100644 arch/nds32/include/asm/u-boot.h
create mode 100644 arch/nds32/include/asm/unaligned.h
diff --git a/arch/nds32/include/asm/bitops.h b/arch/nds32/include/asm/bitops.h
new file mode 100644
index 000..f658a03
--- /dev/null
+++ b/arch/nds32/include/asm/bitops.h
@@ -0,0 +1,150 @@
+/*
+ * Copyright 1995, Russell King.
+ * Various bits and pieces copyrights include:
+ * Linus Torvalds (test_bit).
+ *
+ * Copyright (C) 2010 Andes Technology Corporation
+ * Shawn Lin, Andes Technology Corporation
+ *
+ * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1).
+ *
+ * Please note that the code in this file should never be included
+ * from user space. Many of these are not implemented in assembler
+ * since they would be too costly. Also, they require priviledged
+ * instructions (which are not available from user mode) to ensure
+ * that they are atomic.
+ */
+
+#ifndef __ASM_NDS_BITOPS_H
+#define __ASM_NDS_BITOPS_H
+
+#ifdef __KERNEL__
+
+#define smp_mb__before_clear_bit() do { } while (0)
+#define smp_mb__after_clear_bit() do { } while (0)
+
+/*
+ * Function prototypes to keep gcc -Wall happy.
+ */
+extern void set_bit(int nr, volatile void * addr);
+
+static inline void __set_bit(int nr, volatile void *addr)
+{
+ ((unsigned char *) addr)[nr >> 3] |= (1U << (nr & 7));
+}
+
+extern void clear_bit(int nr, volatile void * addr);
+
+static inline void __clear_bit(int nr, volatile void *addr)
+{
+ ((unsigned char *) addr)[nr >> 3] &= ~(1U << (nr & 7));
+}
+
+extern void change_bit(int nr, volatile void * addr);
+
+static inline void __change_bit(int nr, volatile void *addr)
+{
+ ((unsigned char *) addr)[nr >> 3] ^= (1U << (nr & 7));
+}
+
+extern int test_and_set_bit(int nr, volatile void * addr);
+
+static inline int __test_and_set_bit(int nr, volatile void *addr)
+{
+ unsigned int mask = 1 << (nr & 7);
+ unsigned int oldval;
+
+ oldval = ((unsigned char *) addr)[nr >> 3];
+ ((unsigned char *) addr)[nr >> 3] = oldval | mask;
+ return oldval & mask;
+}
+
+extern int test_and_clear_bit(int nr, volatile void * addr);
+
+static inline int __test_and_clear_bit(int nr, volatile void *addr)
+{
+ unsigned int mask = 1 << (nr & 7);
+ unsigned int oldval;
+
+ oldval = ((unsigned char *) addr)[nr >> 3];
+ ((unsigned char *) addr)[nr >> 3] = oldval & ~mask;
+ return oldval & mask;
+}
+
+extern int test_and_change_bit(int nr, volatile void * addr);
+
+static inline int __test_and_change_bit(int nr, volatile void *addr)
+{
+ unsigned int mask = 1 << (nr & 7);
+ unsigned int oldval;
+
+ oldval = ((unsigned char *) addr)[nr >> 3];
+ ((unsigned char *) addr)[nr >> 3] = oldval ^ mask;
+ return oldval & mask;
+}
+
+extern int find_first_zero_bit(void * addr, unsigned size);
+extern int find_next_zero_bit(void * addr, int size, int offset);
+
+/*
+ * This routine doesn't need to be atomic.
+ */
+static inline int test_bit(int nr, const void * addr)
+{
+ return ((unsigned char *) addr)[nr >> 3] & (1U <
Re: [U-Boot] [PATCH v2] arm926ejs, suen3: fix relocation issues
> -Original Message- > From: Heiko Schocher [mailto:h...@denx.de] > Sent: Tuesday, October 19, 2010 1:39 PM > To: u-boot@lists.denx.de > Cc: Heiko Schocher; Prafulla Wadaskar > Subject: [PATCH v2] arm926ejs, suen3: fix relocation issues > > - use internal 2k security SRAM as RAM for early stack. > - do early inits in board_init_f() > > Signed-off-by: Heiko Schocher > Cc: Prafulla Wadaskar > > --- > changes since v1: > - Add comment from Prafulla Wadaskar, no "1" needed if defining > CONFIG_BOARD_EARLY_INIT_F > > board/keymile/km_arm/km_arm.c | 24 +++- > include/configs/km_arm.h |6 -- > 2 files changed, 19 insertions(+), 11 deletions(-) > Applied to u-boot-marvell.git master branch Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH][v1] RTC driver for PT7C4338 chip.
PT7C4338 chip is manufactured by Pericom Technology Inc.
It is a serial real-time clock which provides:
1)Low-power clock/calendar.
2)Programmable square-wave output.
It has 56 bytes of nonvolatile RAM.
Freescale P1010RDB uses PT7C4338 as RTC.
Signed-off-by: Priyanka Jain
Acked-by: Timur Tabi
Signed-off-by: Priyanka Jain
---
Incoperated Heiko's review comments.
drivers/rtc/Makefile |1 +
drivers/rtc/pt7c4338.c | 154
2 files changed, 155 insertions(+), 0 deletions(-)
create mode 100644 drivers/rtc/pt7c4338.c
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 98734db..bbf9a7e 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -57,6 +57,7 @@ COBJS-$(CONFIG_RTC_MPC5200) += mpc5xxx.o
COBJS-$(CONFIG_RTC_MPC8xx) += mpc8xx.o
COBJS-$(CONFIG_RTC_PCF8563) += pcf8563.o
COBJS-$(CONFIG_RTC_PL031) += pl031.o
+COBJS-$(CONFIG_RTC_PT7C4338) += pt7c4338.o
COBJS-$(CONFIG_RTC_RS5C372A) += rs5c372.o
COBJS-$(CONFIG_RTC_RTC4543) += rtc4543.o
COBJS-$(CONFIG_RTC_RX8025) += rx8025.o
diff --git a/drivers/rtc/pt7c4338.c b/drivers/rtc/pt7c4338.c
new file mode 100644
index 000..016da4f
--- /dev/null
+++ b/drivers/rtc/pt7c4338.c
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2010 Freescale Semiconductor, Inc.
+ *
+ * Author: Priyanka Jain
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/*
+ * This file provides Date & Time support (no alarms) for PT7C4338 chip.
+ *
+ * This file is based on drivers/rtc/ds1337.c
+ *
+ * PT7C4338 chip is manufactured by Pericom Technology Inc.
+ * It is a serial real-time clock which provides
+ * 1)Low-power clock/calendar.
+ * 2)Programmable square-wave output.
+ * It has 56 bytes of nonvolatile RAM.
+ *
+ * Freescale P1010RDB uses PT7C4338 as RTC.
+ */
+
+#include
+#include
+#include
+#include
+
+/* RTC register addresses */
+#define RTC_SEC_REG_ADDR0x0
+#define RTC_MIN_REG_ADDR0x1
+#define RTC_HR_REG_ADDR 0x2
+#define RTC_DAY_REG_ADDR0x3
+#define RTC_DATE_REG_ADDR 0x4
+#define RTC_MON_REG_ADDR0x5
+#define RTC_YR_REG_ADDR 0x6
+#define RTC_CTL_STAT_REG_ADDR 0x7
+
+/* RTC second register address bit */
+#define RTC_SEC_BIT_CH 0x80/* Clock Halt (in Register 0) */
+
+/* RTC control and status register bits */
+#define RTC_CTL_STAT_BIT_RS00x1/* Rate select 0 */
+#define RTC_CTL_STAT_BIT_RS10x2/* Rate select 1 */
+#define RTC_CTL_STAT_BIT_SQWE 0x10 /* Square Wave Enable */
+#define RTC_CTL_STAT_BIT_OSF0x20 /* Oscillator Stop Flag */
+#define RTC_CTL_STAT_BIT_OUT0x80 /* Output Level Control */
+
+/* RTC reset value */
+#define RTC_PT7C4338_RESET_VAL \
+ (RTC_CTL_STAT_BIT_RS0 | RTC_CTL_STAT_BIT_RS1 | RTC_CTL_STAT_BIT_OUT)
+
+/** Helper functions /
+static u8 rtc_read(u8 reg)
+{
+ return i2c_reg_read(CONFIG_SYS_I2C_RTC_ADDR, reg);
+}
+
+static void rtc_write(u8 reg, u8 val)
+{
+ i2c_reg_write(CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+}
+//
+
+/* Get the current time from the RTC */
+int rtc_get(struct rtc_time *tmp)
+{
+ int ret = 0;
+ u8 sec, min, hour, mday, wday, mon, year, ctl_stat;
+
+ ctl_stat = rtc_read(RTC_CTL_STAT_REG_ADDR);
+ sec = rtc_read(RTC_SEC_REG_ADDR);
+ min = rtc_read(RTC_MIN_REG_ADDR);
+ hour = rtc_read(RTC_HR_REG_ADDR);
+ wday = rtc_read(RTC_DAY_REG_ADDR);
+ mday = rtc_read(RTC_DATE_REG_ADDR);
+ mon = rtc_read(RTC_MON_REG_ADDR);
+ year = rtc_read(RTC_YR_REG_ADDR);
+ debug("Get RTC year: %02x mon: %02x mday: %02x wday: %02x "
+ "hr: %02x min: %02x sec: %02x control_status: %02x\n",
+ year, mon, mday, wday, hour, min, sec, ctl_stat);
+
+ if (ctl_stat & RTC_CTL_STAT_BIT_OSF) {
+ printf("### Warning: RTC oscillator has stopped\n");
+ /* clear the OSF flag */
+ rtc_write(RTC_CTL_STAT_REG_ADDR,
+ rtc_read(RTC_CTL_STAT_REG_ADDR)\
+ & ~RTC_CTL_STAT_BIT_OSF);
+ ret = -1;
+ }
+
+ if (sec & RTC_SEC_BIT_CH) {
+ pr
Re: [U-Boot] [PATCH] arm926ejs, suen3: fix relocation issues
> -Original Message- > From: Prafulla Wadaskar > Sent: Tuesday, October 19, 2010 4:35 PM > To: 'Eric Cooper'; Heiko Schocher > Cc: u-boot@lists.denx.de > Subject: RE: [PATCH] arm926ejs, suen3: fix relocation issues > > > > > -Original Message- > > From: Eric Cooper [mailto:e...@cmu.edu] > > Sent: Tuesday, October 19, 2010 4:14 PM > > To: Heiko Schocher > > Cc: Prafulla Wadaskar; u-boot@lists.denx.de > > Subject: Re: [PATCH] arm926ejs, suen3: fix relocation issues > > > > > Maybe, Eric (added to cc: ) should also try to do early > things (like > > > kirkwood_mpp_conf()) in board_early_init_f() as I on the suen3? > > > > I will try this and let you know. But the most helpful > data point for > > me would be whether display_banner etc. currently works on a > > SheevaPlug, which is almost identical to the DockStar. > > Hi Eric > I checked on Sheevaplug, but sheevaplug has usb-UART > interface, that does not help to test this. > Since by the time UART is up board is in booted state. > > There is anther way to test this, erase native u-boot and > check from boot from DRAM, I have not tested this yet. > > But I think this must be problem on sheevaplug too ? Crosschecked, This problem is on all the Kirkwood boards, I am posting fix up patch for all Marvell boards. Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] Kirkwood: bugfix: broken early console messages
It has been observed that, the complete u-boot banner
does not appear on the console when the system is booted
from NAND/NOR/SPI flash.
This patch fixes this issue on all Marvell boards by adding
board_early_init_f() support
Signed-off-by: Prafulla Wadaskar
---
board/Marvell/guruplug/guruplug.c |6 +-
board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |6 +-
board/Marvell/openrd_base/openrd_base.c |6 +-
board/Marvell/rd6281a/rd6281a.c |6 +-
board/Marvell/sheevaplug/sheevaplug.c |6 +-
include/configs/mv-common.h |1 +
6 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/board/Marvell/guruplug/guruplug.c
b/board/Marvell/guruplug/guruplug.c
index 4df4e9b..1f0e67a 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -30,7 +30,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init(void)
+int board_early_init_f(void)
{
/*
* default gpio configuration
@@ -96,7 +96,11 @@ int board_init(void)
0
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/
diff --git a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
index 93d1400..80fd20b 100644
--- a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
+++ b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
@@ -32,7 +32,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init(void)
+int board_early_init_f(void)
{
/*
* default gpio configuration
@@ -98,7 +98,11 @@ int board_init(void)
0
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/
diff --git a/board/Marvell/openrd_base/openrd_base.c
b/board/Marvell/openrd_base/openrd_base.c
index d006b2d..10109c1 100644
--- a/board/Marvell/openrd_base/openrd_base.c
+++ b/board/Marvell/openrd_base/openrd_base.c
@@ -35,7 +35,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init(void)
+int board_early_init_f(void)
{
/*
* default gpio configuration
@@ -102,7 +102,11 @@ int board_init(void)
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/
diff --git a/board/Marvell/rd6281a/rd6281a.c b/board/Marvell/rd6281a/rd6281a.c
index 0d76146..e69e035 100644
--- a/board/Marvell/rd6281a/rd6281a.c
+++ b/board/Marvell/rd6281a/rd6281a.c
@@ -31,7 +31,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init(void)
+int board_early_init_f(void)
{
/*
* default gpio configuration
@@ -97,7 +97,11 @@ int board_init(void)
0
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/
diff --git a/board/Marvell/sheevaplug/sheevaplug.c
b/board/Marvell/sheevaplug/sheevaplug.c
index 173a7b8..d7dc80c 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -30,7 +30,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init(void)
+int board_early_init_f(void)
{
/*
* default gpio configuration
@@ -96,7 +96,11 @@ int board_init(void)
0
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index bdcebd3..39f0f08 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -142,6 +142,7 @@
#define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
#define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */
+#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits*/
#define CONFIG_DISPLAY_CPUINFO /* Display cpu info */
#define CONFIG_NR_DRAM_BANKS 4
#define CONFIG_STACKSIZE 0x0010 /* regular stack- 1M */
--
1.5.3.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] MX51: add CONFIG_SYS_TEXT_BASE to vision2 board, use general ld script
Recent patch changed TEXT_BASE to CONFIG_SYS_TEXT_BASE and vision2 board was not updated. Signed-off-by: Stefano Babic --- board/ttcontrol/vision2/config.mk |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/ttcontrol/vision2/config.mk b/board/ttcontrol/vision2/config.mk index 59f3367..952037e 100644 --- a/board/ttcontrol/vision2/config.mk +++ b/board/ttcontrol/vision2/config.mk @@ -20,6 +20,6 @@ # MA 02111-1307 USA # -LDSCRIPT = $(CPUDIR)/$(SOC)/u-boot.lds -TEXT_BASE = 0x9780 +CONFIG_SYS_TEXT_BASE = 0x9780 IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage_hynix.cfg +ALL += $(obj)u-boot.imx -- 1.7.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH][v2] RTC driver for PT7C4338 chip.
PT7C4338 chip is manufactured by Pericom Technology Inc.
It is a serial real-time clock which provides:
1)Low-power clock/calendar.
2)Programmable square-wave output.
It has 56 bytes of nonvolatile RAM.
Freescale P1010RDB uses PT7C4338 as RTC.
Signed-off-by: Priyanka Jain
Acked-by: Timur Tabi
---
Incoperated Heiko's review comments.
drivers/rtc/Makefile |1 +
drivers/rtc/pt7c4338.c | 154
2 files changed, 155 insertions(+), 0 deletions(-)
create mode 100644 drivers/rtc/pt7c4338.c
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile
index 98734db..bbf9a7e 100644
--- a/drivers/rtc/Makefile
+++ b/drivers/rtc/Makefile
@@ -57,6 +57,7 @@ COBJS-$(CONFIG_RTC_MPC5200) += mpc5xxx.o
COBJS-$(CONFIG_RTC_MPC8xx) += mpc8xx.o
COBJS-$(CONFIG_RTC_PCF8563) += pcf8563.o
COBJS-$(CONFIG_RTC_PL031) += pl031.o
+COBJS-$(CONFIG_RTC_PT7C4338) += pt7c4338.o
COBJS-$(CONFIG_RTC_RS5C372A) += rs5c372.o
COBJS-$(CONFIG_RTC_RTC4543) += rtc4543.o
COBJS-$(CONFIG_RTC_RX8025) += rx8025.o
diff --git a/drivers/rtc/pt7c4338.c b/drivers/rtc/pt7c4338.c
new file mode 100644
index 000..016da4f
--- /dev/null
+++ b/drivers/rtc/pt7c4338.c
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2010 Freescale Semiconductor, Inc.
+ *
+ * Author: Priyanka Jain
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/*
+ * This file provides Date & Time support (no alarms) for PT7C4338 chip.
+ *
+ * This file is based on drivers/rtc/ds1337.c
+ *
+ * PT7C4338 chip is manufactured by Pericom Technology Inc.
+ * It is a serial real-time clock which provides
+ * 1)Low-power clock/calendar.
+ * 2)Programmable square-wave output.
+ * It has 56 bytes of nonvolatile RAM.
+ *
+ * Freescale P1010RDB uses PT7C4338 as RTC.
+ */
+
+#include
+#include
+#include
+#include
+
+/* RTC register addresses */
+#define RTC_SEC_REG_ADDR0x0
+#define RTC_MIN_REG_ADDR0x1
+#define RTC_HR_REG_ADDR 0x2
+#define RTC_DAY_REG_ADDR0x3
+#define RTC_DATE_REG_ADDR 0x4
+#define RTC_MON_REG_ADDR0x5
+#define RTC_YR_REG_ADDR 0x6
+#define RTC_CTL_STAT_REG_ADDR 0x7
+
+/* RTC second register address bit */
+#define RTC_SEC_BIT_CH 0x80/* Clock Halt (in Register 0) */
+
+/* RTC control and status register bits */
+#define RTC_CTL_STAT_BIT_RS00x1/* Rate select 0 */
+#define RTC_CTL_STAT_BIT_RS10x2/* Rate select 1 */
+#define RTC_CTL_STAT_BIT_SQWE 0x10 /* Square Wave Enable */
+#define RTC_CTL_STAT_BIT_OSF0x20 /* Oscillator Stop Flag */
+#define RTC_CTL_STAT_BIT_OUT0x80 /* Output Level Control */
+
+/* RTC reset value */
+#define RTC_PT7C4338_RESET_VAL \
+ (RTC_CTL_STAT_BIT_RS0 | RTC_CTL_STAT_BIT_RS1 | RTC_CTL_STAT_BIT_OUT)
+
+/** Helper functions /
+static u8 rtc_read(u8 reg)
+{
+ return i2c_reg_read(CONFIG_SYS_I2C_RTC_ADDR, reg);
+}
+
+static void rtc_write(u8 reg, u8 val)
+{
+ i2c_reg_write(CONFIG_SYS_I2C_RTC_ADDR, reg, val);
+}
+//
+
+/* Get the current time from the RTC */
+int rtc_get(struct rtc_time *tmp)
+{
+ int ret = 0;
+ u8 sec, min, hour, mday, wday, mon, year, ctl_stat;
+
+ ctl_stat = rtc_read(RTC_CTL_STAT_REG_ADDR);
+ sec = rtc_read(RTC_SEC_REG_ADDR);
+ min = rtc_read(RTC_MIN_REG_ADDR);
+ hour = rtc_read(RTC_HR_REG_ADDR);
+ wday = rtc_read(RTC_DAY_REG_ADDR);
+ mday = rtc_read(RTC_DATE_REG_ADDR);
+ mon = rtc_read(RTC_MON_REG_ADDR);
+ year = rtc_read(RTC_YR_REG_ADDR);
+ debug("Get RTC year: %02x mon: %02x mday: %02x wday: %02x "
+ "hr: %02x min: %02x sec: %02x control_status: %02x\n",
+ year, mon, mday, wday, hour, min, sec, ctl_stat);
+
+ if (ctl_stat & RTC_CTL_STAT_BIT_OSF) {
+ printf("### Warning: RTC oscillator has stopped\n");
+ /* clear the OSF flag */
+ rtc_write(RTC_CTL_STAT_REG_ADDR,
+ rtc_read(RTC_CTL_STAT_REG_ADDR)\
+ & ~RTC_CTL_STAT_BIT_OSF);
+ ret = -1;
+ }
+
+ if (sec & RTC_SEC_BIT_CH) {
+ printf("### Warning: RTC oscilla
[U-Boot] [PATCH] omap3evm: Fix mechanism to identify board revision
Function omap3_evm_get_revision() - to identify the
board revision was called at end of setup_net_chip().
Board revision can be ascertained only by identifying
the Ethernet chipset - but combining setup operations
with revision detection isn't a good idea. So, moved
the function after call to setup_net_chip().
Function setup_net_chip() should be ideally be called
only when CONFIG_CMD_NET is defined. But this leaves
the board revision "undetected". This patch allows
static definition of revision or default fallback to
the latest revision.
Signed-off-by: Sanjeev Premi
---
board/ti/evm/evm.c | 22 +++---
board/ti/evm/evm.h |2 ++
include/configs/omap3_evm.h |5 +
3 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
index 73330db..09d14f7 100644
--- a/board/ti/evm/evm.c
+++ b/board/ti/evm/evm.c
@@ -46,6 +46,11 @@ u8 get_omap3_evm_rev(void)
static void omap3_evm_get_revision(void)
{
+#if defined(CONFIG_CMD_NET)
+ /*
+* Board revision can be ascertained only by identifying
+* the Ethernet chipset.
+*/
unsigned int smsc_id;
/* Ethernet PHY ID is stored at ID_REV register */
@@ -62,6 +67,19 @@ static void omap3_evm_get_revision(void)
default:
omap3_evm_version = OMAP3EVM_BOARD_GEN_2;
}
+#else
+#if defined(CONFIG_STATIC_BOARD_REV)
+ /*
+* Look for static defintion of the board revision
+*/
+ omap3_evm_version = CONFIG_STATIC_BOARD_REV;
+#else
+ /*
+* Fallback to the default above.
+*/
+ omap3_evm_version = OMAP3EVM_BOARD_GEN_2;
+#endif
+#endif /* CONFIG_CMD_NET */
}
#ifdef CONFIG_USB_OMAP3
@@ -110,6 +128,7 @@ int misc_init_r(void)
#if defined(CONFIG_CMD_NET)
setup_net_chip();
#endif
+ omap3_evm_get_revision();
dieid_num_r();
@@ -163,9 +182,6 @@ static void setup_net_chip(void)
writel(GPIO0, &gpio3_base->cleardataout);
udelay(1);
writel(GPIO0, &gpio3_base->setdataout);
-
- /* determine omap3evm revision */
- omap3_evm_get_revision();
}
int board_eth_init(bd_t *bis)
diff --git a/board/ti/evm/evm.h b/board/ti/evm/evm.h
index e2581f6..a76deb8 100644
--- a/board/ti/evm/evm.h
+++ b/board/ti/evm/evm.h
@@ -47,7 +47,9 @@ enum {
u8 get_omap3_evm_rev(void);
+#if defined(CONFIG_CMD_NET)
static void setup_net_chip(void);
+#endif
/*
* IEN - Input Enable
diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
index cd38698..271c985 100644
--- a/include/configs/omap3_evm.h
+++ b/include/configs/omap3_evm.h
@@ -351,6 +351,11 @@ extern unsigned int boot_flash_type;
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_INIT_SP_ADDR(LOW_LEVEL_SRAM_STACK -
CONFIG_SYS_GBL_DATA_SIZE)
+/*
+ * Define the board revision statically
+ */
+/* #define CONFIG_STATIC_BOARD_REV OMAP3EVM_BOARD_GEN_2 */
+
/*
* SMSC9115 Ethernet from SMSC9118 family
*
--
1.7.2.2
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch V2] update board EB+CPUx9K2
Am 2010-10-20 08:48, schrieb Andreas Bießmann: > Dear Reinhard Meyer, > > Am 19.10.2010 um 20:30 schrieb Reinhard Meyer: >>> +#define CONFIG_SYS_TEXT_BASE 0x >> How does this work with a text base of 0? Am I missing something? > > This should work when booting from NOR. The first MiB (0x-0x0010) > is mapped to internal SRAM, internal ROM _or_ NOR on CS0 depending on 'BMS' > Pin and REMAP command -> datasheet at91rm9200 p17. Nevertheless I would > prefer to explicitly address NOR flash on CS0 with 0x1000. > This is right. The board boot from a 16-bit NOR Flash. regards Jens Scharsig ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Notification in Malloc
Dear Kostaras Nikolaos, In message <4cbea38b.9080...@intracomdefense.com> you wrote: > > error on the requested space. New condition includes the equal as well > as the less: > > if ((long)bytes <= 0) return 0; > > This seems to fix the problems, after the malloc invocation with size 0. > If there is > another way to deal with this, plz keep me posted. Makes sense. Can you please provide a proper patch? See http://www.denx.de/wiki/U-Boot/Patches for instructions. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de To be awake is to be alive.- Henry David Thoreau, in "Walden" ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Kirkwood: bugfix: broken early console messages
Hello Prafulla,
Prafulla Wadaskar wrote:
> It has been observed that, the complete u-boot banner
> does not appear on the console when the system is booted
> from NAND/NOR/SPI flash.
>
> This patch fixes this issue on all Marvell boards by adding
> board_early_init_f() support
>
> Signed-off-by: Prafulla Wadaskar
> ---
> board/Marvell/guruplug/guruplug.c |6 +-
> board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |6 +-
> board/Marvell/openrd_base/openrd_base.c |6 +-
> board/Marvell/rd6281a/rd6281a.c |6 +-
> board/Marvell/sheevaplug/sheevaplug.c |6 +-
> include/configs/mv-common.h |1 +
> 6 files changed, 26 insertions(+), 5 deletions(-)
>
> diff --git a/board/Marvell/guruplug/guruplug.c
> b/board/Marvell/guruplug/guruplug.c
> index 4df4e9b..1f0e67a 100644
> --- a/board/Marvell/guruplug/guruplug.c
> +++ b/board/Marvell/guruplug/guruplug.c
> @@ -30,7 +30,7 @@
>
> DECLARE_GLOBAL_DATA_PTR;
>
> -int board_init(void)
> +int board_early_init_f(void)
> {
Maybe, you can make a mv-common.c which contains this
(and maybe other mv common?) functions?
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] [PATCH] nand: constify id/manu tables
These id tables need not be writable.
Signed-off-by: Mike Frysinger
---
drivers/mtd/nand/nand_base.c |6 +++---
drivers/mtd/nand/nand_ids.c |4 ++--
include/linux/mtd/nand.h |4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 21cc5a3..b74d040 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -2409,11 +2409,11 @@ static void nand_set_defaults(struct nand_chip *chip,
int busw)
/*
* Get the flash and manufacturer id and lookup if the type is supported
*/
-static struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
+static const struct nand_flash_dev *nand_get_flash_type(struct mtd_info *mtd,
struct nand_chip *chip,
int busw, int *maf_id)
{
- struct nand_flash_dev *type = NULL;
+ const struct nand_flash_dev *type = NULL;
int i, dev_id, maf_idx;
int tmp_id, tmp_manf;
@@ -2587,7 +2587,7 @@ int nand_scan_ident(struct mtd_info *mtd, int maxchips)
{
int i, busw, nand_maf_id;
struct nand_chip *chip = mtd->priv;
- struct nand_flash_dev *type;
+ const struct nand_flash_dev *type;
/* Get buswidth to select the correct functions */
busw = chip->options & NAND_BUSWIDTH_16;
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index 25b22ec..8d7ea76 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -22,7 +22,7 @@
+ 256 256 Byte page size
* 512 512 Byte page size
*/
-struct nand_flash_dev nand_flash_ids[] = {
+const struct nand_flash_dev nand_flash_ids[] = {
#ifdef CONFIG_MTD_NAND_MUSEUM_IDS
{"NAND 1MiB 5V 8-bit", 0x6e, 256, 1, 0x1000, 0},
@@ -132,7 +132,7 @@ struct nand_flash_dev nand_flash_ids[] = {
/*
* Manufacturer ID list
*/
-struct nand_manufacturers nand_manuf_ids[] = {
+const struct nand_manufacturers nand_manuf_ids[] = {
{NAND_MFR_TOSHIBA, "Toshiba"},
{NAND_MFR_SAMSUNG, "Samsung"},
{NAND_MFR_FUJITSU, "Fujitsu"},
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 94ad0c0..519f47e 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -470,8 +470,8 @@ struct nand_manufacturers {
char * name;
};
-extern struct nand_flash_dev nand_flash_ids[];
-extern struct nand_manufacturers nand_manuf_ids[];
+extern const struct nand_flash_dev nand_flash_ids[];
+extern const struct nand_manufacturers nand_manuf_ids[];
extern int nand_scan_bbt(struct mtd_info *mtd, struct nand_bbt_descr *bd);
extern int nand_update_bbt(struct mtd_info *mtd, loff_t offs);
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] usb: musb: constify a bit
These ep and root hub structures need not be writable.
Signed-off-by: Mike Frysinger
---
drivers/usb/musb/musb_core.c |2 +-
drivers/usb/musb/musb_core.h |2 +-
drivers/usb/musb/musb_hcd.c | 36 +++-
3 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
index 6fe2c39..545ebf4 100644
--- a/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@ -76,7 +76,7 @@ void musb_start(void)
* epinfo - Pointer to EP configuration table
* cnt - Number of entries in the EP conf table.
*/
-void musb_configure_ep(struct musb_epinfo *epinfo, u8 cnt)
+void musb_configure_ep(const struct musb_epinfo *epinfo, u8 cnt)
{
u16 csr;
u16 fifoaddr = 64; /* First 64 bytes of FIFO reserved for EP0 */
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index 8f73876..a8adcce 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -357,7 +357,7 @@ extern struct musb_regs *musbr;
/* exported functions */
extern void musb_start(void);
-extern void musb_configure_ep(struct musb_epinfo *epinfo, u8 cnt);
+extern void musb_configure_ep(const struct musb_epinfo *epinfo, u8 cnt);
extern void write_fifo(u8 ep, u32 length, void *fifo_data);
extern void read_fifo(u8 ep, u32 length, void *fifo_data);
diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index f38b279..8b0c61d 100644
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -29,7 +29,7 @@
#define USB_MSC_BBB_GET_MAX_LUN0xFE
/* Endpoint configuration information */
-static struct musb_epinfo epinfo[3] = {
+static const struct musb_epinfo epinfo[3] = {
{MUSB_BULK_EP, 1, 512}, /* EP1 - Bluk Out - 512 Bytes */
{MUSB_BULK_EP, 0, 512}, /* EP1 - Bluk In - 512 Bytes */
{MUSB_INTR_EP, 0, 64} /* EP2 - Interrupt IN - 64 Bytes */
@@ -41,7 +41,7 @@ static int rh_devnum;
static u32 port_status;
/* Device descriptor */
-static u8 root_hub_dev_des[] = {
+static const u8 root_hub_dev_des[] = {
0x12, /* __u8 bLength; */
0x01, /* __u8 bDescriptorType; Device */
0x00, /* __u16 bcdUSB; v1.1 */
@@ -63,7 +63,7 @@ static u8 root_hub_dev_des[] = {
};
/* Configuration descriptor */
-static u8 root_hub_config_des[] = {
+static const u8 root_hub_config_des[] = {
0x09, /* __u8 bLength; */
0x02, /* __u8 bDescriptorType; Configuration */
0x19, /* __u16 wTotalLength; */
@@ -96,14 +96,14 @@ static u8 root_hub_config_des[] = {
0xff/* __u8 ep_bInterval; 255 ms */
};
-static unsigned char root_hub_str_index0[] = {
+static const unsigned char root_hub_str_index0[] = {
0x04, /* __u8 bLength; */
0x03, /* __u8 bDescriptorType; String-descriptor */
0x09, /* __u8 lang ID */
0x04, /* __u8 lang ID */
};
-static unsigned char root_hub_str_index1[] = {
+static const unsigned char root_hub_str_index1[] = {
0x1c, /* __u8 bLength; */
0x03, /* __u8 bDescriptorType; String-descriptor */
'M',/* __u8 Unicode */
@@ -557,7 +557,7 @@ static int musb_submit_rh_msg(struct usb_device *dev,
unsigned long pipe,
int len = 0;
int stat = 0;
u32 datab[4];
- u8 *data_buf = (u8 *) datab;
+ const u8 *data_buf = (u8 *) datab;
u16 bmRType_bReq;
u16 wValue;
u16 wIndex;
@@ -778,25 +778,27 @@ static int musb_submit_rh_msg(struct usb_device *dev,
unsigned long pipe,
break;
- case RH_GET_DESCRIPTOR | RH_CLASS:
+ case RH_GET_DESCRIPTOR | RH_CLASS: {
+ u8 *_data_buf = (u8 *) datab;
debug("RH_GET_DESCRIPTOR | RH_CLASS\n");
- data_buf[0] = 0x09; /* min length; */
- data_buf[1] = 0x29;
- data_buf[2] = 0x1; /* 1 port */
- data_buf[3] = 0x01; /* per-port power switching */
- data_buf[3] |= 0x10;/* no overcurrent reporting */
+ _data_buf[0] = 0x09;/* min length; */
+ _data_buf[1] = 0x29;
+ _data_buf[2] = 0x1; /* 1 port */
+ _data_buf[3] = 0x01;/* per-port power switching */
+ _data_buf[3] |= 0x10; /* no overcurrent reporting */
/* Corresponds to data_buf[4-7] */
- data_buf[4] = 0;
- data_buf[5] = 5;
- data_buf[6] = 0;
- data_buf[7] = 0x02;
- data_buf[8] = 0xff;
+ _data_buf[4] = 0;
+ _data_buf[5] = 5;
+ _data_buf[6] = 0;
+ _data_buf[7] = 0x
[U-Boot] [PATCH] mmc: constify & localize data
These local vars need not be writable nor exported.
Signed-off-by: Mike Frysinger
---
drivers/mmc/mmc.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index c543d83..0e6c710 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -567,7 +567,7 @@ retry_scr:
/* frequency bases */
/* divided by 10 to be nice to platforms without floating point */
-int fbase[] = {
+static const int fbase[] = {
1,
10,
100,
@@ -577,7 +577,7 @@ int fbase[] = {
/* Multiplier values for TRAN_SPEED. Multiplied by 10 to be nice
* to platforms without floating point.
*/
-int multipliers[] = {
+static const int multipliers[] = {
0, /* reserved */
10,
12,
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] usb_storage: constify us_direction lookup table
Signed-off-by: Mike Frysinger
---
common/usb_storage.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 613c4f0..1e6cd6a 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -70,7 +70,7 @@
/* direction table -- this indicates the direction of the data
* transfer for each command code -- a 1 indicates input
*/
-unsigned char us_direction[256/8] = {
+static const unsigned char us_direction[256/8] = {
0x28, 0x81, 0x14, 0x14, 0x20, 0x01, 0x90, 0x77,
0x0C, 0x20, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01,
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] copy_filename: constify "src" arg
Signed-off-by: Mike Frysinger
---
include/net.h |2 +-
net/net.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net.h b/include/net.h
index a29dafc..dd673f0 100644
--- a/include/net.h
+++ b/include/net.h
@@ -526,7 +526,7 @@ extern ushort string_to_VLAN(char *s);
extern ushort getenv_VLAN(char *);
/* copy a filename (allow for "..." notation, limit length) */
-extern voidcopy_filename (char *dst, char *src, int size);
+extern voidcopy_filename (char *dst, const char *src, int size);
/* get a random source port */
extern unsigned int random_port(void);
diff --git a/net/net.c b/net/net.c
index d5a5429..7576419 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1865,7 +1865,7 @@ NetSetIP(volatile uchar * xip, IPaddr_t dest, int dport,
int sport, int len)
ip->ip_sum = ~NetCksum((uchar *)ip, IP_HDR_SIZE_NO_UDP / 2);
}
-void copy_filename (char *dst, char *src, int size)
+void copy_filename (char *dst, const char *src, int size)
{
if (*src && (*src == '"')) {
++src;
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] string_to_VLAN: constify "var" arg
Signed-off-by: Mike Frysinger
---
include/net.h |2 +-
net/net.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net.h b/include/net.h
index dd673f0..5e3495b 100644
--- a/include/net.h
+++ b/include/net.h
@@ -520,7 +520,7 @@ extern IPaddr_t string_to_ip(char *s);
extern voidVLAN_to_string (ushort x, char *s);
/* Convert a string to a vlan id */
-extern ushort string_to_VLAN(char *s);
+extern ushort string_to_VLAN(const char *s);
/* read a VLAN id from an environment variable */
extern ushort getenv_VLAN(char *);
diff --git a/net/net.c b/net/net.c
index 7576419..a609632 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1913,7 +1913,7 @@ void VLAN_to_string(ushort x, char *s)
sprintf(s, "%d", x & VLAN_IDMASK);
}
-ushort string_to_VLAN(char *s)
+ushort string_to_VLAN(const char *s)
{
ushort id;
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] string_to_ip: constify "s" arg
Signed-off-by: Mike Frysinger
---
include/net.h |2 +-
lib/net_utils.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/net.h b/include/net.h
index 5e3495b..95ef8ab 100644
--- a/include/net.h
+++ b/include/net.h
@@ -514,7 +514,7 @@ static inline int is_valid_ether_addr(const u8 *addr)
extern voidip_to_string (IPaddr_t x, char *s);
/* Convert a string to ip address */
-extern IPaddr_t string_to_ip(char *s);
+extern IPaddr_t string_to_ip(const char *s);
/* Convert a VLAN id to a string */
extern voidVLAN_to_string (ushort x, char *s);
diff --git a/lib/net_utils.c b/lib/net_utils.c
index f03b098..b425a68 100644
--- a/lib/net_utils.c
+++ b/lib/net_utils.c
@@ -28,7 +28,7 @@
#include
-IPaddr_t string_to_ip(char *s)
+IPaddr_t string_to_ip(const char *s)
{
IPaddr_t addr;
char *e;
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] cmd_date: constify
Many strings in this file need not be writable.
Signed-off-by: Mike Frysinger
---
common/cmd_date.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/cmd_date.c b/common/cmd_date.c
index 50b4240..88c8d85 100644
--- a/common/cmd_date.c
+++ b/common/cmd_date.c
@@ -31,7 +31,7 @@
DECLARE_GLOBAL_DATA_PTR;
-const char *weekdays[] = {
+static const char * const weekdays[] = {
"Sun", "Mon", "Tues", "Wednes", "Thurs", "Fri", "Satur",
};
@@ -41,7 +41,7 @@ const char *weekdays[] = {
#define RELOC(a) ((typeof(a))((unsigned long)(a) + gd->reloc_off))
#endif
-int mk_date (char *, struct rtc_time *);
+int mk_date (const char *, struct rtc_time *);
int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
@@ -106,7 +106,7 @@ int do_date (cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
/*
* simple conversion of two-digit string with error checking
*/
-static int cnvrt2 (char *str, int *valp)
+static int cnvrt2 (const char *str, int *valp)
{
int val;
@@ -131,7 +131,7 @@ static int cnvrt2 (char *str, int *valp)
* Some basic checking for valid values is done, but this will not catch
* all possible error conditions.
*/
-int mk_date (char *datestr, struct rtc_time *tmp)
+int mk_date (const char *datestr, struct rtc_time *tmp)
{
int len, val;
char *ptr;
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] cmd_itest: constify & localize op table
No one else needs this table. While we're here, use the standard
ARRAY_SIZE helper macro.
Signed-off-by: Mike Frysinger
---
common/cmd_itest.c |8 +++-
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/common/cmd_itest.c b/common/cmd_itest.c
index 8dd8927..fa6a0c3 100644
--- a/common/cmd_itest.c
+++ b/common/cmd_itest.c
@@ -46,7 +46,7 @@ struct op_tbl_s {
typedef struct op_tbl_s op_tbl_t;
-op_tbl_t op_table [] = {
+static const op_tbl_t op_table [] = {
{ "-lt", LT },
{ "<" , LT },
{ "-gt", GT },
@@ -62,8 +62,6 @@ op_tbl_t op_table [] = {
{ "<=" , LE },
};
-#define op_tbl_size (sizeof(op_table)/sizeof(op_table[0]))
-
static long evalexp(char *s, int w)
{
long l = 0;
@@ -138,12 +136,12 @@ static int arithcomp (char *s, char *t, int op, int w)
int binary_test (char *op, char *arg1, char *arg2, int w)
{
int len, i;
- op_tbl_t *optp;
+ const op_tbl_t *optp;
len = strlen(op);
for (optp = (op_tbl_t *)&op_table, i = 0;
-i < op_tbl_size;
+i < ARRAY_SIZE(op_table);
optp++, i++) {
if ((strncmp (op, optp->op, len) == 0) && (len == strlen
(optp->op))) {
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] image: constify lookup tables
These are pure lookup tables -- no need to be writable.
Signed-off-by: Mike Frysinger
---
common/image.c | 14 +++---
include/image.h |4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/common/image.c b/common/image.c
index 385464d..0005fc5 100644
--- a/common/image.c
+++ b/common/image.c
@@ -74,7 +74,7 @@ static const image_header_t* image_get_ramdisk (ulong
rd_addr, uint8_t arch,
#include
#endif /* !USE_HOSTCC*/
-static table_entry_t uimage_arch[] = {
+static const table_entry_t uimage_arch[] = {
{ IH_ARCH_INVALID,NULL, "Invalid ARCH", },
{ IH_ARCH_ALPHA, "alpha","Alpha",},
{ IH_ARCH_ARM,"arm", "ARM", },
@@ -96,7 +96,7 @@ static table_entry_t uimage_arch[] = {
{ -1, "", "", },
};
-static table_entry_t uimage_os[] = {
+static const table_entry_t uimage_os[] = {
{ IH_OS_INVALID, NULL, "Invalid OS", },
{ IH_OS_LINUX,"linux","Linux",},
#if defined(CONFIG_LYNXKDI) || defined(USE_HOSTCC)
@@ -129,7 +129,7 @@ static table_entry_t uimage_os[] = {
{ -1, "", "", },
};
-static table_entry_t uimage_type[] = {
+static const table_entry_t uimage_type[] = {
{ IH_TYPE_INVALID,NULL, "Invalid Image", },
{ IH_TYPE_FILESYSTEM, "filesystem", "Filesystem Image", },
{ IH_TYPE_FIRMWARE, "firmware", "Firmware", },
@@ -144,7 +144,7 @@ static table_entry_t uimage_type[] = {
{ -1, "", "", },
};
-static table_entry_t uimage_comp[] = {
+static const table_entry_t uimage_comp[] = {
{ IH_COMP_NONE, "none", "uncompressed", },
{ IH_COMP_BZIP2, "bzip2","bzip2 compressed", },
{ IH_COMP_GZIP, "gzip", "gzip compressed", },
@@ -516,7 +516,7 @@ static void genimg_print_time (time_t timestamp)
* long entry name if translation succeeds
* msg otherwise
*/
-char *get_table_entry_name (table_entry_t *table, char *msg, int id)
+char *get_table_entry_name(const table_entry_t *table, char *msg, int id)
{
for (; table->id >= 0; ++table) {
if (table->id == id)
@@ -563,10 +563,10 @@ const char *genimg_get_comp_name (uint8_t comp)
* entry id if translation succeeds
* -1 otherwise
*/
-int get_table_entry_id (table_entry_t *table,
+int get_table_entry_id(const table_entry_t *table,
const char *table_name, const char *name)
{
- table_entry_t *t;
+ const table_entry_t *t;
#ifdef USE_HOSTCC
int first = 1;
diff --git a/include/image.h b/include/image.h
index 49d6280..005e0d2 100644
--- a/include/image.h
+++ b/include/image.h
@@ -300,14 +300,14 @@ typedef struct table_entry {
* entry that matches the given short name. If a matching entry is
* found, it's id is returned to the caller.
*/
-int get_table_entry_id (table_entry_t *table,
+int get_table_entry_id(const table_entry_t *table,
const char *table_name, const char *name);
/*
* get_table_entry_name() scans the translation table trying to find
* an entry that matches the given id. If a matching entry is found,
* its long name is returned to the caller.
*/
-char *get_table_entry_name (table_entry_t *table, char *msg, int id);
+char *get_table_entry_name(const table_entry_t *table, char *msg, int id);
const char *genimg_get_os_name (uint8_t os);
const char *genimg_get_arch_name (uint8_t arch);
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ctype: constify lookup table
Signed-off-by: Mike Frysinger
---
include/linux/ctype.h |2 +-
lib/ctype.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/linux/ctype.h b/include/linux/ctype.h
index afa3639..6dec944 100644
--- a/include/linux/ctype.h
+++ b/include/linux/ctype.h
@@ -15,7 +15,7 @@
#define _X 0x40/* hex digit */
#define _SP0x80/* hard space (0x20) */
-extern unsigned char _ctype[];
+extern const unsigned char _ctype[];
#define __ismask(x) (_ctype[(int)(unsigned char)(x)])
diff --git a/lib/ctype.c b/lib/ctype.c
index 6ed0468..dffe563 100644
--- a/lib/ctype.c
+++ b/lib/ctype.c
@@ -29,7 +29,7 @@
#include
-unsigned char _ctype[] = {
+const unsigned char _ctype[] = {
_C,_C,_C,_C,_C,_C,_C,_C, /* 0-7 */
_C,_C|_S,_C|_S,_C|_S,_C|_S,_C|_S,_C,_C,/* 8-15 */
_C,_C,_C,_C,_C,_C,_C,_C, /* 16-23 */
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] boot cmds: convert to getenv_yesno() with autostart
Use the new helper func to clean up duplicate logic handling of the
autostart env var.
Signed-off-by: Mike Frysinger
---
common/cmd_fdc.c |3 +--
common/cmd_fdos.c |2 +-
common/cmd_ide.c |2 +-
common/cmd_nand.c |4 ++--
common/cmd_net.c |2 +-
common/cmd_scsi.c |2 +-
common/cmd_usb.c |2 +-
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c
index 831a07f..1655bdc 100644
--- a/common/cmd_fdc.c
+++ b/common/cmd_fdc.c
@@ -721,7 +721,6 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char
* const argv[])
image_header_t *hdr; /* used for fdc boot */
unsigned char boot_drive;
int i,nrofblk;
- char *ep;
int rcode = 0;
#if defined(CONFIG_FIT)
const void *fit_hdr = NULL;
@@ -824,7 +823,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char
* const argv[])
load_addr = addr;
/* Check if we should attempt an auto-start */
- if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
+ if (getenv_yesno("autostart")) {
char *local_args[2];
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c
index a8822d9..5bb5c64 100644
--- a/common/cmd_fdos.c
+++ b/common/cmd_fdos.c
@@ -99,7 +99,7 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
size, load_addr);
/* Check if we should attempt an auto-start */
-if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
+if (getenv_yesno("autostart")) {
char *local_args[2];
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
local_args[0] = argv[0];
diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index ea0f4a7..f684e78 100644
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -496,7 +496,7 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char
* const argv[])
load_addr = addr;
/* Check if we should attempt an auto-start */
- if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
+ if (getenv_yesno("autostart")) {
char *local_args[2];
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index 634d036..f79bd6d 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -711,7 +711,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t
*nand,
ulong offset, ulong addr, char *cmd)
{
int r;
- char *ep, *s;
+ char *s;
size_t cnt;
image_header_t *hdr;
#if defined(CONFIG_FIT)
@@ -787,7 +787,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t
*nand,
load_addr = addr;
/* Check if we should attempt an auto-start */
- if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) {
+ if (getenv_yesno("autostart")) {
char *local_args[2];
extern int do_bootm(cmd_tbl_t *, int, int, char *[]);
diff --git a/common/cmd_net.c b/common/cmd_net.c
index 44d17db..3320104 100644
--- a/common/cmd_net.c
+++ b/common/cmd_net.c
@@ -213,7 +213,7 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc,
char * const argv[])
flush_cache(load_addr, size);
/* Loading ok, check if we should attempt an auto-start */
- if (((s = getenv("autostart")) != NULL) && (strcmp(s,"yes") == 0)) {
+ if (getenv_yesno("autostart")) {
char *local_args[2];
local_args[0] = argv[0];
local_args[1] = NULL;
diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c
index 6b937f9..0a3dd07 100644
--- a/common/cmd_scsi.c
+++ b/common/cmd_scsi.c
@@ -327,7 +327,7 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char
* const argv[])
flush_cache (addr, (cnt+1)*info.blksz);
/* Check if we should attempt an auto-start */
- if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) {
+ if (getenv_yesno("autostart")) {
char *local_args[2];
extern int do_bootm (cmd_tbl_t *, int, int, char *[]);
local_args[0] = argv[0];
diff --git a/common/cmd_usb.c b/common/cmd_usb.c
index 226ea0d..a7cffa5 100644
--- a/common/cmd_usb.c
+++ b/common/cmd_usb.c
@@ -488,7 +488,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char *
const argv[])
flush_cache(addr, (cnt+1)*info.blksz);
/* Check if we should attempt an auto-start */
- if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) {
+ if (getenv_yesno("autostart")) {
char *local_args[2];
extern int do_bootm(cmd_tbl_t *, int, int, char *[]);
local_args[0] = argv[0];
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailma
[U-Boot] [PATCH] stdio: constify "name" arg in public api
Signed-off-by: Mike Frysinger
---
common/console.c|4 ++--
common/stdio.c |4 ++--
include/common.h|2 +-
include/iomux.h |2 +-
include/stdio_dev.h |4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/common/console.c b/common/console.c
index 7e01886..8c650e0 100644
--- a/common/console.c
+++ b/common/console.c
@@ -479,7 +479,7 @@ inline void dbg(const char *fmt, ...)
/** U-Boot INIT FUNCTIONS */
-struct stdio_dev *search_device(int flags, char *name)
+struct stdio_dev *search_device(int flags, const char *name)
{
struct stdio_dev *dev;
@@ -491,7 +491,7 @@ struct stdio_dev *search_device(int flags, char *name)
return NULL;
}
-int console_assign(int file, char *devname)
+int console_assign(int file, const char *devname)
{
int flag;
struct stdio_dev *dev;
diff --git a/common/stdio.c b/common/stdio.c
index 2501369..462df24 100644
--- a/common/stdio.c
+++ b/common/stdio.c
@@ -105,7 +105,7 @@ struct list_head* stdio_get_list(void)
return &(devs.list);
}
-struct stdio_dev* stdio_get_by_name(char* name)
+struct stdio_dev* stdio_get_by_name(const char *name)
{
struct list_head *pos;
struct stdio_dev *dev;
@@ -155,7 +155,7 @@ int stdio_register (struct stdio_dev * dev)
* returns 0 if success, -1 if device is assigned and 1 if devname not found
*/
#ifdef CONFIG_SYS_STDIO_DEREGISTER
-int stdio_deregister(char *devname)
+int stdio_deregister(const char *devname)
{
int l;
struct list_head *pos;
diff --git a/include/common.h b/include/common.h
index 0686a17..9acd086 100644
--- a/include/common.h
+++ b/include/common.h
@@ -654,7 +654,7 @@ char * strmhz(char *buf, long hz);
/* common/console.c */
intconsole_init_f(void); /* Before relocation; uses the serial stuff
*/
intconsole_init_r(void); /* After relocation; uses the console stuff
*/
-intconsole_assign (int file, char *devname); /* Assign the console
*/
+intconsole_assign(int file, const char *devname); /* Assign the console
*/
intctrlc (void);
inthad_ctrlc (void); /* have we had a Control-C since last clear? */
void clear_ctrlc (void); /* clear the Control-C condition */
diff --git a/include/iomux.h b/include/iomux.h
index e38a81e..fcf0f93 100644
--- a/include/iomux.h
+++ b/include/iomux.h
@@ -43,6 +43,6 @@ extern int cd_count[MAX_FILES];
int iomux_doenv(const int, const char *);
void iomux_printdevs(const int);
-struct stdio_dev *search_device(int, char *);
+struct stdio_dev *search_device(int, const char *);
#endif /* _IO_MUX_H */
diff --git a/include/stdio_dev.h b/include/stdio_dev.h
index 83da4cd..82ad463 100644
--- a/include/stdio_dev.h
+++ b/include/stdio_dev.h
@@ -93,10 +93,10 @@ int stdio_register (struct stdio_dev * dev);
intstdio_init (void);
void stdio_print_current_devices(void);
#ifdef CONFIG_SYS_STDIO_DEREGISTER
-intstdio_deregister(char *devname);
+intstdio_deregister(const char *devname);
#endif
struct list_head* stdio_get_list(void);
-struct stdio_dev* stdio_get_by_name(char* name);
+struct stdio_dev* stdio_get_by_name(const char* name);
struct stdio_dev* stdio_clone(struct stdio_dev *dev);
#ifdef CONFIG_ARM_DCC_MULTI
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] ext2: constify file/dir names
Signed-off-by: Mike Frysinger
---
fs/ext2/ext2fs.c |4 ++--
include/ext2fs.h |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/ext2/ext2fs.c b/fs/ext2/ext2fs.c
index a88cf87..e119e13 100644
--- a/fs/ext2/ext2fs.c
+++ b/fs/ext2/ext2fs.c
@@ -749,7 +749,7 @@ int ext2fs_find_file
}
-int ext2fs_ls (char *dirname) {
+int ext2fs_ls (const char *dirname) {
ext2fs_node_t dirnode;
int status;
@@ -769,7 +769,7 @@ int ext2fs_ls (char *dirname) {
}
-int ext2fs_open (char *filename) {
+int ext2fs_open (const char *filename) {
ext2fs_node_t fdiro = NULL;
int status;
int len;
diff --git a/include/ext2fs.h b/include/ext2fs.h
index de935b0..163a9bb 100644
--- a/include/ext2fs.h
+++ b/include/ext2fs.h
@@ -74,8 +74,8 @@ typedef enum
extern int ext2fs_set_blk_dev(block_dev_desc_t *rbdd, int part);
-extern int ext2fs_ls (char *dirname);
-extern int ext2fs_open (char *filename);
+extern int ext2fs_ls (const char *dirname);
+extern int ext2fs_open (const char *filename);
extern int ext2fs_read (char *buf, unsigned len);
extern int ext2fs_mount (unsigned part_length);
extern int ext2fs_close(void);
--
1.7.3.1
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Kirkwood: bugfix: broken early console messages
> -Original Message-
> From: Heiko Schocher [mailto:h...@denx.de]
> Sent: Wednesday, October 20, 2010 4:42 PM
> To: Prafulla Wadaskar
> Cc: u-boot@lists.denx.de; Ashish Karkare; Prabhanjan Sarnaik
> Subject: Re: [U-Boot] [PATCH] Kirkwood: bugfix: broken early
> console messages
>
> Hello Prafulla,
>
> Prafulla Wadaskar wrote:
> > It has been observed that, the complete u-boot banner
> > does not appear on the console when the system is booted
> > from NAND/NOR/SPI flash.
> >
> > This patch fixes this issue on all Marvell boards by adding
> > board_early_init_f() support
> >
> > Signed-off-by: Prafulla Wadaskar
> > ---
> > board/Marvell/guruplug/guruplug.c |6 +-
> > board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |6 +-
> > board/Marvell/openrd_base/openrd_base.c |6 +-
> > board/Marvell/rd6281a/rd6281a.c |6 +-
> > board/Marvell/sheevaplug/sheevaplug.c |6 +-
> > include/configs/mv-common.h |1 +
> > 6 files changed, 26 insertions(+), 5 deletions(-)
> >
> > diff --git a/board/Marvell/guruplug/guruplug.c
> b/board/Marvell/guruplug/guruplug.c
> > index 4df4e9b..1f0e67a 100644
> > --- a/board/Marvell/guruplug/guruplug.c
> > +++ b/board/Marvell/guruplug/guruplug.c
> > @@ -30,7 +30,7 @@
> >
> > DECLARE_GLOBAL_DATA_PTR;
> >
> > -int board_init(void)
> > +int board_early_init_f(void)
> > {
>
> Maybe, you can make a mv-common.c which contains this
> (and maybe other mv common?) functions?
I thought of it,
but specifically for this function, which is doing GPIOs and MPP configuration
only, and generally it is very board specific.
But having mv-common.c is not a bad idea..
Let's check it out in next step :-)
Regards..
Prafulla . .
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/1] MX5:use common u-boot.lds of cpu layer
Remove u-boot.lds from mx5 and use the common u-boot.lds
of cpu layer. This patch also fix the building errors:
arch/arm/cpu/armv7/start.o: In function `_rel_dyn_start_ofs':
arch/arm/cpu/armv7/start.S:283: undefined reference to `__rel_dyn_start'
arch/arm/cpu/armv7/start.o: In function `_rel_dyn_end_ofs':
arch/arm/cpu/armv7/start.S:283: undefined reference to `__rel_dyn_end'
arch/arm/cpu/armv7/start.o: In function `_dynsym_start_ofs':
arch/arm/cpu/armv7/start.S:283: undefined reference to `__dynsym_start'
Signed-off-by: Jason Liu
---
arch/arm/cpu/armv7/mx5/u-boot.lds | 73 -
board/freescale/mx51evk/config.mk |1 -
board/ttcontrol/vision2/config.mk |3 +-
3 files changed, 1 insertions(+), 76 deletions(-)
diff --git a/arch/arm/cpu/armv7/mx5/u-boot.lds
b/arch/arm/cpu/armv7/mx5/u-boot.lds
deleted file mode 100644
index 55d6599..000
--- a/arch/arm/cpu/armv7/mx5/u-boot.lds
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * January 2004 - Changed to support H4 device
- * Copyright (c) 2004 Texas Instruments
- *
- * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering,
- *
- * (C) Copyright 2009 Freescale Semiconductor, Inc.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-SECTIONS
-{
- . = 0x;
-
- . = ALIGN(4);
- .text :
- {
- arch/arm/cpu/armv7/start.o
- *(.text)
- }
-
- . = ALIGN(4);
- .rodata : { *(.rodata) }
-
- . = ALIGN(4);
- .data : {
- *(.data)
- __datarel_start = .;
- *(.data.rel)
- __datarelrolocal_start = .;
- *(.data.rel.ro.local)
- __datarellocal_start = .;
- *(.data.rel.local)
- __datarelro_start = .;
- *(.data.rel.ro)
- }
-
- __got_start = .;
- . = ALIGN(4);
- .got : { *(.got) }
- __got_end = .;
-
- . = .;
- __u_boot_cmd_start = .;
- .u_boot_cmd : { *(.u_boot_cmd) }
- __u_boot_cmd_end = .;
-
- . = ALIGN(4);
- __bss_start = .;
- .bss : { *(.bss) }
- _end = .;
-}
diff --git a/board/freescale/mx51evk/config.mk
b/board/freescale/mx51evk/config.mk
index 716fca9..6e90671 100644
--- a/board/freescale/mx51evk/config.mk
+++ b/board/freescale/mx51evk/config.mk
@@ -20,7 +20,6 @@
# MA 02111-1307 USA
#
-LDSCRIPT = $(CPUDIR)/$(SOC)/u-boot.lds
CONFIG_SYS_TEXT_BASE = 0x9780
IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage.cfg
ALL += $(obj)u-boot.imx
diff --git a/board/ttcontrol/vision2/config.mk
b/board/ttcontrol/vision2/config.mk
index 59f3367..f282068 100644
--- a/board/ttcontrol/vision2/config.mk
+++ b/board/ttcontrol/vision2/config.mk
@@ -20,6 +20,5 @@
# MA 02111-1307 USA
#
-LDSCRIPT = $(CPUDIR)/$(SOC)/u-boot.lds
-TEXT_BASE = 0x9780
+CONFIG_SYS_TEXT_BASE = 0x9780
IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage_hynix.cfg
--
1.7.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Kirkwood: bugfix: broken early console messages
I can confirm that this patch solves the problem on the dockstar hardware. Minor: there was incorrect extra whitespace in this line: #define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits*/ Should be: #define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */ Thanks. -- Eric Cooper e c c @ c m u . e d u ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] "Verifying Checksum ... Bad Data CRC" when kernel
Hi ZHAO JiHua, > I've found the answer and confirmed it. FTP transfer corrupted uImage. [...] > I don't know which, FileZilla or WS_FTP, corrupted uImage. Very likely you need to sort out the well known ascii/binary problem (e.g. [1]) for your ftp setups. Cheers Detlev -- So maybe I lost track of my point. But if I left a mark, C-x C-x should be all I need. -- David Kastrup, emacs-devel.gnu.org <87hbj37v4x@lola.goethe.zz> -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-40 Fax: (+49)-8142-66989-80 Email: d...@denx.de ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/1] vision2: add u-boot.imx to ALL targe
Signed-off-by: Jason Liu --- board/ttcontrol/vision2/config.mk |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/board/ttcontrol/vision2/config.mk b/board/ttcontrol/vision2/config.mk index 59f3367..1b18489 100644 --- a/board/ttcontrol/vision2/config.mk +++ b/board/ttcontrol/vision2/config.mk @@ -23,3 +23,4 @@ LDSCRIPT = $(CPUDIR)/$(SOC)/u-boot.lds TEXT_BASE = 0x9780 IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage_hynix.cfg +ALL += $(obj)u-boot.imx -- 1.7.0.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] MX5:use common u-boot.lds of cpu layer
On 10/20/2010 02:02 PM, Jason Liu wrote: > Remove u-boot.lds from mx5 and use the common u-boot.lds > of cpu layer. This patch also fix the building errors: > > arch/arm/cpu/armv7/start.o: In function `_rel_dyn_start_ofs': > arch/arm/cpu/armv7/start.S:283: undefined reference to `__rel_dyn_start' > arch/arm/cpu/armv7/start.o: In function `_rel_dyn_end_ofs': > arch/arm/cpu/armv7/start.S:283: undefined reference to `__rel_dyn_end' > arch/arm/cpu/armv7/start.o: In function `_dynsym_start_ofs': > arch/arm/cpu/armv7/start.S:283: undefined reference to `__dynsym_start' Hi Jason, I have already sent this morning patch covering the vision2 board and fixing the same issue. Please drop from your patch the part concerning the vision2 board and resubmit. Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/1] vision2: add u-boot.imx to ALL targe
On 10/20/2010 02:19 PM, Jason Liu wrote: > Signed-off-by: Jason Liu > --- > board/ttcontrol/vision2/config.mk |1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/board/ttcontrol/vision2/config.mk > b/board/ttcontrol/vision2/config.mk > index 59f3367..1b18489 100644 > --- a/board/ttcontrol/vision2/config.mk > +++ b/board/ttcontrol/vision2/config.mk > @@ -23,3 +23,4 @@ > LDSCRIPT = $(CPUDIR)/$(SOC)/u-boot.lds > TEXT_BASE = 0x9780 > IMX_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/imximage_hynix.cfg > +ALL += $(obj)u-boot.imx Already done, http://marc.info/?l=u-boot&m=128757095116850&w=2 Best regards, Stefano Babic -- = DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de = ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 0/4] ARMV7: OMAP: I2C driver: Restructure code to eliminate udelay calls and improve performance
I've been preparing a patch series for Beagle and Overo that detects expansion board configuration information by reading a 128 byte I2C EEPROM on each expansion board. Using the OMAP I2C driver in its current form takes about 5-6 seconds to read this small number of bytes! Executing the i2c probe command takes close to 10 seconds. Examining the code I see that there are a large number of fairly long udelay calls throughout the driver (10 - 50 milliseconds). I looked through the linux driver and did not see equivalent delays in that code. In fact the longest delay in the linux code was one millisecond. In looking at the TRM I2C section for OMAP3 and OMAP4 I don't see any requirement for delays in the programming model description. This patch restructures the i2c driver to eliminate most of the udelay calls by monitoring state changes in the status register. The EEPROM reads and the i2c probe execution are now instantaneous. This patch series was tested on OMAP3 (Overo) and OMAP4 (Panda). I do not have access to OMAP2 hardware for testing. Steve Sakoman (4): ARMV7: OMAP: I2C driver: Use same timeout value as linux kernel driver ARMV7: OMAP: I2C driver: Restructure i2c_read_byte function ARMV7: OMAP: I2C driver: Restructure i2c_write_byte function ARMV7: OMAP: I2C driver: Restructure i2c_probe function drivers/i2c/omap24xx_i2c.c | 204 --- 1 files changed, 114 insertions(+), 90 deletions(-) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 1/4] ARMV7: OMAP: I2C driver: Use same timeout value as linux kernel driver
This patch matches the poll interval (1 millisecond) and timeout (1 second)
used in the linux driver. It also adds a return value of 0 in the event of
a timeout error and cleans up some formatting errors in that section of the
code.
Signed-off-by: Steve Sakoman
Tested-by: Heiko Schocher
---
drivers/i2c/omap24xx_i2c.c | 14 --
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 3febd1f..b69d051 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -27,7 +27,7 @@
#include "omap24xx_i2c.h"
-#define I2C_TIMEOUT10
+#define I2C_TIMEOUT1000
static void wait_for_bb (void);
static u16 wait_for_pin (void);
@@ -392,13 +392,13 @@ int i2c_write (uchar chip, uint addr, int alen, uchar *
buffer, int len)
static void wait_for_bb (void)
{
- int timeout = 10;
+ int timeout = I2C_TIMEOUT;
u16 stat;
writew(0x, &i2c_base->stat); /* clear current interruts...*/
while ((stat = readw (&i2c_base->stat) & I2C_STAT_BB) && timeout--) {
writew (stat, &i2c_base->stat);
- udelay (5);
+ udelay(1000);
}
if (timeout <= 0) {
@@ -411,7 +411,7 @@ static void wait_for_bb (void)
static u16 wait_for_pin (void)
{
u16 status;
- int timeout = 10;
+ int timeout = I2C_TIMEOUT;
do {
udelay (1000);
@@ -424,8 +424,10 @@ static u16 wait_for_pin (void)
if (timeout <= 0) {
printf ("timed out in wait_for_pin: I2C_STAT=%x\n",
readw (&i2c_base->stat));
- writew(0x, &i2c_base->stat);
-}
+ writew(0x, &i2c_base->stat);
+ status = 0;
+ }
+
return status;
}
--
1.7.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 2/4] ARMV7: OMAP: I2C driver: Restructure i2c_read_byte function
This patch removes the "magic number" delays and instead
monitors state changes in the status register bits.
Signed-off-by: Steve Sakoman
Tested-by: Heiko Schocher
---
drivers/i2c/omap24xx_i2c.c | 76 +--
1 files changed, 37 insertions(+), 39 deletions(-)
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index b69d051..d176b5d 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -159,58 +159,56 @@ static int i2c_read_byte (u8 devaddr, u8 regoffset, u8 *
value)
/* no stop bit needed here */
writew (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_TRX,
&i2c_base->con);
- status = wait_for_pin ();
-
- if (status & I2C_STAT_XRDY) {
- /* Important: have to use byte access */
- writeb (regoffset, &i2c_base->data);
- udelay (2);
- if (readw (&i2c_base->stat) & I2C_STAT_NACK) {
+ /* send register offset */
+ while (1) {
+ status = wait_for_pin();
+ if (status == 0 || status & I2C_STAT_NACK) {
i2c_error = 1;
+ goto read_exit;
+ }
+ if (status & I2C_STAT_XRDY) {
+ /* Important: have to use byte access */
+ writeb(regoffset, &i2c_base->data);
+ writew(I2C_STAT_XRDY, &i2c_base->stat);
+ }
+ if (status & I2C_STAT_ARDY) {
+ writew(I2C_STAT_ARDY, &i2c_base->stat);
+ break;
}
- } else {
- i2c_error = 1;
}
- if (!i2c_error) {
- writew (I2C_CON_EN, &i2c_base->con);
- while (readw(&i2c_base->stat) &
- (I2C_STAT_XRDY | I2C_STAT_ARDY)) {
- udelay (1);
- /* Have to clear pending interrupt to clear I2C_STAT */
- writew (0x, &i2c_base->stat);
+ /* set slave address */
+ writew(devaddr, &i2c_base->sa);
+ /* read one byte from slave */
+ writew(1, &i2c_base->cnt);
+ /* need stop bit here */
+ writew(I2C_CON_EN | I2C_CON_MST |
+ I2C_CON_STT | I2C_CON_STP,
+ &i2c_base->con);
+
+ /* receive data */
+ while (1) {
+ status = wait_for_pin();
+ if (status == 0 || status & I2C_STAT_NACK) {
+ i2c_error = 1;
+ goto read_exit;
}
-
- /* set slave address */
- writew (devaddr, &i2c_base->sa);
- /* read one byte from slave */
- writew (1, &i2c_base->cnt);
- /* need stop bit here */
- writew (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_STP,
- &i2c_base->con);
-
- status = wait_for_pin ();
if (status & I2C_STAT_RRDY) {
#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
defined(CONFIG_OMAP44XX)
- *value = readb (&i2c_base->data);
+ *value = readb(&i2c_base->data);
#else
- *value = readw (&i2c_base->data);
+ *value = readw(&i2c_base->data);
#endif
- udelay (2);
- } else {
- i2c_error = 1;
+ writew(I2C_STAT_RRDY, &i2c_base->stat);
}
-
- if (!i2c_error) {
- writew (I2C_CON_EN, &i2c_base->con);
- while (readw (&i2c_base->stat) &
- (I2C_STAT_RRDY | I2C_STAT_ARDY)) {
- udelay (1);
- writew (0x, &i2c_base->stat);
- }
+ if (status & I2C_STAT_ARDY) {
+ writew(I2C_STAT_ARDY, &i2c_base->stat);
+ break;
}
}
+
+read_exit:
flush_fifo();
writew (0x, &i2c_base->stat);
writew (0, &i2c_base->cnt);
--
1.7.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 3/4] ARMV7: OMAP: I2C driver: Restructure i2c_write_byte function
This patch removes the "magic number" delays and instead
monitors state changes in the status register bits.
Signed-off-by: Steve Sakoman
Tested-by: Heiko Schocher
---
drivers/i2c/omap24xx_i2c.c | 78 +++
1 files changed, 42 insertions(+), 36 deletions(-)
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index d176b5d..35201c3 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -218,7 +218,7 @@ read_exit:
static int i2c_write_byte (u8 devaddr, u8 regoffset, u8 value)
{
int i2c_error = 0;
- u16 status, stat;
+ u16 status;
/* wait until bus not busy */
wait_for_bb ();
@@ -231,49 +231,55 @@ static int i2c_write_byte (u8 devaddr, u8 regoffset, u8
value)
writew (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_TRX |
I2C_CON_STP, &i2c_base->con);
- /* wait until state change */
- status = wait_for_pin ();
-
- if (status & I2C_STAT_XRDY) {
-#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
-defined(CONFIG_OMAP44XX)
- /* send out 1 byte */
- writeb (regoffset, &i2c_base->data);
- writew (I2C_STAT_XRDY, &i2c_base->stat);
-
- status = wait_for_pin ();
- if ((status & I2C_STAT_XRDY)) {
- /* send out next 1 byte */
- writeb (value, &i2c_base->data);
- writew (I2C_STAT_XRDY, &i2c_base->stat);
- } else {
+ while (1) {
+ status = wait_for_pin();
+ if (status == 0 || status & I2C_STAT_NACK) {
i2c_error = 1;
+ goto write_exit;
}
+ if (status & I2C_STAT_XRDY) {
+#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
+defined(CONFIG_OMAP44XX)
+ /* send register offset */
+ writeb(regoffset, &i2c_base->data);
+ writew(I2C_STAT_XRDY, &i2c_base->stat);
+
+ while (1) {
+ status = wait_for_pin();
+ if (status == 0 || status & I2C_STAT_NACK) {
+ i2c_error = 1;
+ goto write_exit;
+ }
+ if (status & I2C_STAT_XRDY) {
+ /* send data */
+ writeb(value, &i2c_base->data);
+ writew(I2C_STAT_XRDY, &i2c_base->stat);
+ }
+ if (status & I2C_STAT_ARDY) {
+ writew(I2C_STAT_ARDY, &i2c_base->stat);
+ break;
+ }
+ }
+ break;
#else
- /* send out two bytes */
- writew ((value << 8) + regoffset, &i2c_base->data);
+ /* send out two bytes */
+ writew((value << 8) + regoffset, &i2c_base->data);
+ writew(I2C_STAT_XRDY, &i2c_base->stat);
#endif
- /* must have enough delay to allow BB bit to go low */
- udelay (5);
- if (readw (&i2c_base->stat) & I2C_STAT_NACK) {
- i2c_error = 1;
}
- } else {
- i2c_error = 1;
+ if (status & I2C_STAT_ARDY) {
+ writew(I2C_STAT_ARDY, &i2c_base->stat);
+ break;
+ }
}
- if (!i2c_error) {
- int eout = 200;
+ wait_for_bb();
- writew (I2C_CON_EN, &i2c_base->con);
- while ((stat = readw (&i2c_base->stat)) || (readw
(&i2c_base->con) & I2C_CON_MST)) {
- udelay (1000);
- /* have to read to clear intrrupt */
- writew (0x, &i2c_base->stat);
- if(--eout == 0) /* better leave with error than hang */
- break;
- }
- }
+ status = readw(&i2c_base->stat);
+ if (status & I2C_STAT_NACK)
+ i2c_error = 1;
+
+write_exit:
flush_fifo();
writew (0x, &i2c_base->stat);
writew (0, &i2c_base->cnt);
--
1.7.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH RFC 3/4] ARMV7: OMAP: I2C driver: Restructure i2c_write_byte function
On Wed, 2010-10-20 at 08:08 +0200, Heiko Schocher wrote:
> Hello Steve,
>
> Steve Sakoman wrote:
> > This patch removes the "magic number" delays and instead
> > monitors state changes in the status register bits.
> >
> > Signed-off-by: Steve Sakoman
> > ---
> > drivers/i2c/omap24xx_i2c.c | 76
> > +++
> > 1 files changed, 41 insertions(+), 35 deletions(-)
>
> After trying this for the omap3_beagle board, I get an
> compiler warning:
>
> [...@pollux u-boot]$ ./MAKEALL omap3_beagle
> Configuring for omap3_beagle board...
> omap24xx_i2c.c: In function 'i2c_write_byte':
> omap24xx_i2c.c:221: warning: unused variable 'stat'
Hmm . . . I can swear I fixed that! Must be getting old :-)
>textdata bss dec hex filename
> 218103 11412 202384 431899 6971b ./u-boot
>
> - SUMMARY
> Boards compiled: 1
> Boards with warnings or errors: 1 ( omap3_beagle )
> --
> [...@pollux u-boot]$
>
> following patch fixes it.
>
> BTW:
> Just for the record, your patchset works fine and faster
> on the beagle board, for example:
>
> before your after your
> patchset patchset
> i2c probe9s 0,4s
> i2c md 48 0 100 17s 1s
I'm glad that you see the same speedups!
What tool do you use to measure the speedups?
> would you post a v2 of this patch, and I add my
> "Tested-by" to it, or is it OK, if I add my fix patch
> to u-boot-i2c master?
I've posted v2 with your "Tested-by" and the warning fix.
If it helps, the patches are in my omap4-next-upstream branch:
http://www.sakoman.com/cgi-bin/gitweb.cgi?p=u-boot.git;a=shortlog;h=refs/heads/omap4-next-upstream
Thanks for testing and for the comments!
Steve
> From 01c6c59014c4174ad4d13944d740d3491d9cf137 Mon Sep 17 00:00:00 2001
> From: Heiko Schocher
> Date: Wed, 20 Oct 2010 07:57:05 +0200
> Subject: [PATCH] ARMV7: OMAP: I2C driver: fix compiler warning
>
> Signed-off-by: Heiko Schocher
> ---
> drivers/i2c/omap24xx_i2c.c |2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
> index eb153fb..a72d1a1 100644
> --- a/drivers/i2c/omap24xx_i2c.c
> +++ b/drivers/i2c/omap24xx_i2c.c
> @@ -218,7 +218,7 @@ read_exit:
> static int i2c_write_byte (u8 devaddr, u8 regoffset, u8 value)
> {
> int i2c_error = 0;
> - u16 status, stat;
> + u16 status;
>
> /* wait until bus not busy */
> wait_for_bb ();
>
> bye,
> Heiko
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 4/4] ARMV7: OMAP: I2C driver: Restructure i2c_probe function
This patch removes the "magic number" delays and instead
monitors state changes in the status register bits.
Signed-off-by: Steve Sakoman
Tested-by: Heiko Schocher
---
drivers/i2c/omap24xx_i2c.c | 41 ++---
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 35201c3..a72d1a1 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -310,6 +310,7 @@ static void flush_fifo(void)
int i2c_probe (uchar chip)
{
+ u16 status;
int res = 1; /* default = fail */
if (chip == readw (&i2c_base->oa)) {
@@ -325,19 +326,37 @@ int i2c_probe (uchar chip)
writew (chip, &i2c_base->sa);
/* stop bit needed here */
writew (I2C_CON_EN | I2C_CON_MST | I2C_CON_STT | I2C_CON_STP,
&i2c_base->con);
- /* enough delay for the NACK bit set */
- udelay (5);
- if (!(readw (&i2c_base->stat) & I2C_STAT_NACK)) {
- res = 0; /* success case */
- flush_fifo();
- writew(0x, &i2c_base->stat);
- } else {
- writew(0x, &i2c_base->stat); /* failue, clear
sources*/
- writew (readw (&i2c_base->con) | I2C_CON_STP, &i2c_base->con);
/* finish up xfer */
- udelay(2);
- wait_for_bb ();
+ while (1) {
+ status = wait_for_pin();
+ if (status == 0) {
+ res = 1;
+ goto probe_exit;
+ }
+ if (status & I2C_STAT_NACK) {
+ res = 1;
+ writew(0xff, &i2c_base->stat);
+ writew (readw (&i2c_base->con) | I2C_CON_STP,
&i2c_base->con);
+ wait_for_bb ();
+ break;
+ }
+ if (status & I2C_STAT_ARDY) {
+ writew(I2C_STAT_ARDY, &i2c_base->stat);
+ break;
+ }
+ if (status & I2C_STAT_RRDY) {
+ res = 0;
+#if defined(CONFIG_OMAP243X) || defined(CONFIG_OMAP34XX) || \
+defined(CONFIG_OMAP44XX)
+ readb(&i2c_base->data);
+#else
+ readw(&i2c_base->data);
+#endif
+ writew(I2C_STAT_RRDY, &i2c_base->stat);
+ }
}
+
+probe_exit:
flush_fifo();
writew (0, &i2c_base->cnt); /* don't allow any more data in...we don't
want it.*/
writew(0x, &i2c_base->stat);
--
1.7.0.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH RFC 3/4] ARMV7: OMAP: I2C driver: Restructure i2c_write_byte function
Hello Steve, Steve Sakoman wrote: > On Wed, 2010-10-20 at 08:08 +0200, Heiko Schocher wrote: >> Hello Steve, >> >> Steve Sakoman wrote: >>> This patch removes the "magic number" delays and instead >>> monitors state changes in the status register bits. >>> >>> Signed-off-by: Steve Sakoman >>> --- >>> drivers/i2c/omap24xx_i2c.c | 76 >>> +++ >>> 1 files changed, 41 insertions(+), 35 deletions(-) >> After trying this for the omap3_beagle board, I get an >> compiler warning: >> >> [...@pollux u-boot]$ ./MAKEALL omap3_beagle >> Configuring for omap3_beagle board... >> omap24xx_i2c.c: In function 'i2c_write_byte': >> omap24xx_i2c.c:221: warning: unused variable 'stat' > > Hmm . . . I can swear I fixed that! Must be getting old :-) ;-) >>textdata bss dec hex filename >> 218103 11412 202384 431899 6971b ./u-boot >> >> - SUMMARY >> Boards compiled: 1 >> Boards with warnings or errors: 1 ( omap3_beagle ) >> -- >> [...@pollux u-boot]$ >> >> following patch fixes it. >> >> BTW: >> Just for the record, your patchset works fine and faster >> on the beagle board, for example: >> >> before your after your >> patchset patchset >> i2c probe9s 0,4s >> i2c md 48 0 100 17s 1s > > I'm glad that you see the same speedups! > > What tool do you use to measure the speedups? You find it here: ftp://ftp.denx.de/pub/tools/time_log You can start this script for example with: kermit -c 2>&1 | ./time_log "start" and then measure with for example: echo start;i2c md 48 0 100;echo stop and you get the time the command(s) between start and stop needed ... >> would you post a v2 of this patch, and I add my >> "Tested-by" to it, or is it OK, if I add my fix patch >> to u-boot-i2c master? > > I've posted v2 with your "Tested-by" and the warning fix. Ok, 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 v2 0/4] ARMV7: OMAP: I2C driver: Restructure code to eliminate udelay calls and improve performance
Hello Steve, Steve Sakoman wrote: > I've been preparing a patch series for Beagle and Overo that detects expansion > board configuration information by reading a 128 byte I2C EEPROM on each > expansion board. > > Using the OMAP I2C driver in its current form takes about 5-6 seconds to read > this small number of bytes! Executing the i2c probe command takes close > to 10 seconds. > > Examining the code I see that there are a large number of fairly long udelay > calls > throughout the driver (10 - 50 milliseconds). I looked through the linux > driver > and did not see equivalent delays in that code. In fact the longest delay in > the > linux code was one millisecond. > > In looking at the TRM I2C section for OMAP3 and OMAP4 I don't see any > requirement > for delays in the programming model description. > > This patch restructures the i2c driver to eliminate most of the udelay calls > by monitoring state changes in the status register. > > The EEPROM reads and the i2c probe execution are now instantaneous. > > This patch series was tested on OMAP3 (Overo) and OMAP4 (Panda). I do not > have access to OMAP2 hardware for testing. > > Steve Sakoman (4): > ARMV7: OMAP: I2C driver: Use same timeout value as linux kernel > driver > ARMV7: OMAP: I2C driver: Restructure i2c_read_byte function > ARMV7: OMAP: I2C driver: Restructure i2c_write_byte function > ARMV7: OMAP: I2C driver: Restructure i2c_probe function > > drivers/i2c/omap24xx_i2c.c | 204 --- > 1 files changed, 114 insertions(+), 90 deletions(-) Applied v2 to u-boot-i2c.git master 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] Kirkwood: bugfix: broken early console messages
> -Original Message- > From: Eric Cooper [mailto:e...@cmu.edu] > Sent: Wednesday, October 20, 2010 5:54 PM > To: Prafulla Wadaskar > Cc: u-boot@lists.denx.de > Subject: Re: [PATCH] Kirkwood: bugfix: broken early console messages > > I can confirm that this patch solves the problem on the > dockstar hardware. > > Minor: there was incorrect extra whitespace in this line: > > #define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f > for early inits*/ > > Should be: > > #define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f > for early inits */ > > Thanks. Thanks for this feedback Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request: u-boot-i2c
Hello Wolfgang, The following changes since commit 11c8dd36edcc82564a19dbd0103302df66d66db0: FAT: buffer overflow with FAT12/16 (2010-10-20 09:14:38 +0200) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master Steve Sakoman (4): ARMV7: OMAP: I2C driver: Use same timeout value as linux kernel driver ARMV7: OMAP: I2C driver: Restructure i2c_read_byte function ARMV7: OMAP: I2C driver: Restructure i2c_write_byte function ARMV7: OMAP: I2C driver: Restructure i2c_probe function drivers/i2c/omap24xx_i2c.c | 209 --- 1 files changed, 117 insertions(+), 92 deletions(-) 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
[U-Boot] [PATCH V2] Kirkwood: bugfix: broken early console messages
It has been observed that, the complete u-boot banner
does not appear on the console when the system is booted
from NAND/NOR/SPI flash.
This patch fixes this issue on all Marvell boards by adding
board_early_init_f() support
Signed-off-by: Prafulla Wadaskar
---
Change log:
v2: Whitespace removed from configuration comments
board/Marvell/guruplug/guruplug.c |6 +-
board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c |6 +-
board/Marvell/openrd_base/openrd_base.c |6 +-
board/Marvell/rd6281a/rd6281a.c |6 +-
board/Marvell/sheevaplug/sheevaplug.c |6 +-
include/configs/mv-common.h |1 +
6 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/board/Marvell/guruplug/guruplug.c
b/board/Marvell/guruplug/guruplug.c
index 4df4e9b..1f0e67a 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -30,7 +30,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init(void)
+int board_early_init_f(void)
{
/*
* default gpio configuration
@@ -96,7 +96,11 @@ int board_init(void)
0
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/
diff --git a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
index 93d1400..80fd20b 100644
--- a/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
+++ b/board/Marvell/mv88f6281gtw_ge/mv88f6281gtw_ge.c
@@ -32,7 +32,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init(void)
+int board_early_init_f(void)
{
/*
* default gpio configuration
@@ -98,7 +98,11 @@ int board_init(void)
0
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/
diff --git a/board/Marvell/openrd_base/openrd_base.c
b/board/Marvell/openrd_base/openrd_base.c
index d006b2d..10109c1 100644
--- a/board/Marvell/openrd_base/openrd_base.c
+++ b/board/Marvell/openrd_base/openrd_base.c
@@ -35,7 +35,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init(void)
+int board_early_init_f(void)
{
/*
* default gpio configuration
@@ -102,7 +102,11 @@ int board_init(void)
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/
diff --git a/board/Marvell/rd6281a/rd6281a.c b/board/Marvell/rd6281a/rd6281a.c
index 0d76146..e69e035 100644
--- a/board/Marvell/rd6281a/rd6281a.c
+++ b/board/Marvell/rd6281a/rd6281a.c
@@ -31,7 +31,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init(void)
+int board_early_init_f(void)
{
/*
* default gpio configuration
@@ -97,7 +97,11 @@ int board_init(void)
0
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/
diff --git a/board/Marvell/sheevaplug/sheevaplug.c
b/board/Marvell/sheevaplug/sheevaplug.c
index 173a7b8..d7dc80c 100644
--- a/board/Marvell/sheevaplug/sheevaplug.c
+++ b/board/Marvell/sheevaplug/sheevaplug.c
@@ -30,7 +30,7 @@
DECLARE_GLOBAL_DATA_PTR;
-int board_init(void)
+int board_early_init_f(void)
{
/*
* default gpio configuration
@@ -96,7 +96,11 @@ int board_init(void)
0
};
kirkwood_mpp_conf(kwmpp_config);
+ return 0;
+}
+int board_init(void)
+{
/*
* arch number of board
*/
diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index bdcebd3..2b19a34 100644
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -142,6 +142,7 @@
#define CONFIG_CONSOLE_INFO_QUIET /* some code reduction */
#define CONFIG_ARCH_CPU_INIT /* call arch_cpu_init() */
#define CONFIG_ARCH_MISC_INIT /* call arch_misc_init() */
+#define CONFIG_BOARD_EARLY_INIT_F /* call board_init_f for early inits */
#define CONFIG_DISPLAY_CPUINFO /* Display cpu info */
#define CONFIG_NR_DRAM_BANKS 4
#define CONFIG_STACKSIZE 0x0010 /* regular stack- 1M */
--
1.5.3.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] Seagate FreeAgent DockStar support
start with sheevaplug configuration add modifications by Alexander Holler change RAM definitions to one bank (128 MB) change ident string change environment to 0xA define MTD partitions and default environment variables add support for LEDs Signed-off-by: Eric Cooper --- Changes for v2: - rebased on master, post ARM and kirkwood relocation changes - squashed into single commit Pending patches that this depends on: Gray Remlin: kirkwood: Fix uninitialised DRAM struct Prafulla Wadaskar: Kirkwood: bugfix: broken early console messages MAINTAINERS |4 + MAKEALL |1 + board/Marvell/dockstar/Makefile | 51 ++ board/Marvell/dockstar/config.mk| 28 ++ board/Marvell/dockstar/dockstar.c | 178 +++ board/Marvell/dockstar/dockstar.h | 41 board/Marvell/dockstar/kwbimage.cfg | 162 +++ boards.cfg |1 + include/configs/dockstar.h | 119 +++ 9 files changed, 585 insertions(+), 0 deletions(-) create mode 100644 board/Marvell/dockstar/Makefile create mode 100644 board/Marvell/dockstar/config.mk create mode 100644 board/Marvell/dockstar/dockstar.c create mode 100644 board/Marvell/dockstar/dockstar.h create mode 100644 board/Marvell/dockstar/kwbimage.cfg create mode 100644 include/configs/dockstar.h diff --git a/MAINTAINERS b/MAINTAINERS index 5108c54..0a25971 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -585,6 +585,10 @@ Po-Yu Chuang a320evb FA526 (ARM920T-like) (a320 SoC) +Eric Cooper + + dockstarARM926EJS (Kirkwood SoC) + George G. Davis assabet SA1100 diff --git a/MAKEALL b/MAKEALL index c1f3842..83679b4 100755 --- a/MAKEALL +++ b/MAKEALL @@ -327,6 +327,7 @@ LIST_ARM9=" \ cp966 \ da830evm\ da850evm\ + dockstar\ edb9301 \ edb9302 \ edb9302a\ diff --git a/board/Marvell/dockstar/Makefile b/board/Marvell/dockstar/Makefile new file mode 100644 index 000..da9d29e --- /dev/null +++ b/board/Marvell/dockstar/Makefile @@ -0,0 +1,51 @@ +# +# (C) Copyright 2009 +# Marvell Semiconductor +# Written-by: Prafulla Wadaskar +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA +# + +include $(TOPDIR)/config.mk + +LIB= $(obj)lib$(BOARD).a + +COBJS := dockstar.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(obj).depend $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/Marvell/dockstar/config.mk b/board/Marvell/dockstar/config.mk new file mode 100644 index 000..761c2bb --- /dev/null +++ b/board/Marvell/dockstar/config.mk @@ -0,0 +1,28 @@ +# +# (C) Copyright 2009 +# Marvell Semiconductor +# Written-by: Prafulla Wadaskar +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA +# + +CONFIG_SYS_TEXT_BASE =
[U-Boot] maybe a priority mistake in mpc85xx_cpu\init.c
hi, I notice that in "arch\powerpc\cpu\mpc85xx\cpu_init.c" line 193, version 2010.06: if (! memctl->br1 & 1) The original intention is to check if V bit of BR1 is set or not, but the operator "!" has higher priority than "&" ,I think it should be changed to: if (! (memctl->br1 & 1)) please check this question, thanks!___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Subject: [PATCH v2] Support for sending DHCP client options
If CONFIG_BOOTP_OPTIONS is defined at compile-time, the environment
will be checked for the supported DHCPv4 client options during
construction of a "DHCP Discover" or "DHCP Request" packet. Any
found (as listed below, prefixed with dhcp_) will have their value
included in the dhcp packet.
dhcp_vendor-class-identifier
dhcp_user-class
dhcp_dhcp-client-identifier
Signed-off-by: Gray Remlin
---
v2: Remove redundant return value from dhcp_options_prep function
Change dhcp_options_prep function return type to static void
Correct grammatical error in README
README |7 +++
common/cmd_nvedit.c |3 +++
net/bootp.c | 51
+++
tools/env/fw_env.c |4 +++-
4 files changed, 64 insertions(+), 1 deletions(-)
diff --git a/README b/README
index a52f3bf..cd892cc 100644
--- a/README
+++ b/README
@@ -1279,6 +1279,7 @@ The following options need to be configured:
CONFIG_BOOTP_NTPSERVER
CONFIG_BOOTP_TIMEOFFSET
CONFIG_BOOTP_VENDOREX
+ CONFIG_BOOTP_OPTIONS
CONFIG_BOOTP_SERVERIP - TFTP server will be the serverip
environment variable, not the BOOTP server.
@@ -1299,6 +1300,12 @@ The following options need to be configured:
of the "hostname" environment variable is passed as
option 12 to the DHCP server.
+ CONFIG_BOOTP_OPTIONS - The environment is checked for the
+ supported DHCPv4 client options (prefixed with dhcp_), any
+ found are sent during a "DHCP Discover" and "DHCP Request".
+ The DHCP server can use this information to conditionally
+ tailor its response.
+
CONFIG_BOOTP_DHCP_REQUEST_DELAY
A 32bit value in microseconds for a delay between
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 3d30c32..2094e8e 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -224,6 +224,9 @@ int _do_env_set (int flag, int argc, char * const
argv[])
if (ep) { /* variable exists */
#ifndef CONFIG_ENV_OVERWRITE
if ((strcmp (name, "serial#") == 0) ||
+#if defined(CONFIG_BOOTP_OPTIONS)
+ (strcmp(name, "dhcp_vendor-class-identifier") == 0) ||
+#endif /* CONFIG_BOOTP_OPTIONS */
((strcmp (name, "ethaddr") == 0)
#if defined(CONFIG_OVERWRITE_ETHADDR_ONCE) && defined(CONFIG_ETHADDR)
&& (strcmp (ep->data,MK_STR(CONFIG_ETHADDR)) != 0)
diff --git a/net/bootp.c b/net/bootp.c
index 1289e3b..61ecede 100644
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -68,6 +68,53 @@ extern u8 *dhcp_vendorex_prep (u8 *e); /*rtn new e
after add own opts. */
extern u8 *dhcp_vendorex_proc (u8 *e); /*rtn next e if mine,else NULL */
#endif
+#if defined(CONFIG_BOOTP_OPTIONS) /* check environment for dhcp client
options */
+
+/*
+ * The vendor-specifiable options should not be changeable
+ * unless CONFIG_ENV_OVERWRITE has been defined, however
+ * user-specifiable options should be changeable regardless
+ */
+static void dhcp_options_prep(u8 **ep)
+{
+ u8 *e = *ep;
+ char *ptr;
+
+ debug("DHCP Client options start\n");
+
+ /* vendor-specifiable identification string */
+ if ((ptr = getenv("dhcp_vendor-class-identifier"))) {
+ debug("dhcp_vendor-class-identifier=%s\n",ptr);
+ *e++ = 60;
+ *e++ = strlen(ptr);
+ while (*ptr)
+ *e++ = *ptr++;
+ }
+
+ /* user-specifiable identification string */
+ if ((ptr = getenv("dhcp_dhcp-client-identifier"))) {
+ debug("dhcp_dhcp-client-identifier=%s\n",ptr);
+ *e++ = 61;
+ *e++ = strlen(ptr);
+ while (*ptr)
+ *e++ = *ptr++;
+ }
+
+ /* user-specifiable identification string */
+ if ((ptr = getenv("dhcp_user-class"))) {
+ debug("dhcp_user-class=%s\n",ptr);
+ *e++ = 77;
+ *e++ = strlen(ptr);
+ while (*ptr)
+ *e++ = *ptr++;
+ }
+
+ *ep = e;
+ debug("DHCP Client options end\n");
+}
+
+#endif /* CONFIG_BOOTP_OPTIONS */
+
#endif
static int BootpCheckPkt(uchar *pkt, unsigned dest, unsigned src,
unsigned len)
@@ -412,6 +459,10 @@ static int DhcpExtended (u8 * e, int message_type,
IPaddr_t ServerID, IPaddr_t R
}
#endif
+#if defined(CONFIG_BOOTP_OPTIONS)
+ dhcp_options_prep (&e);
+#endif
+
#if defined(CONFIG_BOOTP_VENDOREX)
if ((x = dhcp_vendorex_prep (e)))
return x - start;
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
index 8ff7052..ae37d15 100644
--- a/tools/env/fw_env.c
+++ b/tools/env/fw_env.c
@@ -391,9 +391,11 @@ int fw_env_write(char *name, char *value)
*/
if (oldval) {
/*
-*
[U-Boot] ELF_RELOC causes strange I-cache issues
Hello everybody, after nailing down a few USB and FAT related bugs we had USB running stable on i.MX31, but suddenly the current mainline code behaves strangely again: Repeating simple calls like "usb read 8080 0 1000" will reliably hard hang the system after 3...5 calls. The problem can be avoided by switching off the instruction cache (using the "icache off" command). Trying to track down this problem it turns out that somehow the ELF_RELOC patches seem to be responsible for it. I have a source tree that works perfectly fine, with I-caches on, and after cherry-picking the following commits from the elf_reloc branch the problem appears: 92d5ecb 2010-10-13 10:10:21 arm: implement ELF relocations bafe743 2010-10-13 10:12:52 arm1136, qong: add support for ELF relocations However, we cannot find a real cause in the modified code. Here my request for help: - Has anybody experienced similar problems? - Did your tests of the elf_reloc code include any thorough testing of USB mass storage devices? - If you have any suitable hardware around, could you please run a few such tests (as mentioned above, a simple "usb read 0 1000", repeated 5 times or so, should be sufficient. If you want to be sure, increase the block count and repeat more often. All ideas welcome. Thanks a lot in advance. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Anyone who isn't confused here doesn't really know what's going on. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] USB: sync Queue Element Transfer Descriptor against EHCI spec
Dear Remy Bohmer, In message you wrote: > > > Remy, I hope this is OK with you. > > You seem to be in a hurry... I thought we could be close to a -rc1. Alas, I was wrong once more. > Patch is OK... Unfortunately it seems it ain't so :-( Patch follows... Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "Free markets select for winning solutions."- Eric S. Raymond ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] USB: fix Queue Element Transfer Descriptor changes
Commit 3ed1607 "USB: sync Queue Element Transfer Descriptor against
EHCI spec" added an "__attribute__ ((aligned (32)))" to the
declaration of struct qTD, as used for example in the Linux kernel as
well.
However, it turns out that this attribute causes errors in "usb start"
(like "ERROR: NOT USB_CONFIG_DESC 7b" and similar). Drop the attribute
again.
Signed-off-by: Wolfgang Denk
Cc: Dan Lykowski
Cc: Remy Bohmer
Cc: Stefano Babic
---
drivers/usb/host/ehci.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/host/ehci.h b/drivers/usb/host/ehci.h
index d3aa55b..945ab64 100644
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -175,7 +175,7 @@ struct qTD {
uint32_t qt_buffer_hi[5]; /* Appendix B */
/* pad struct for 32 byte alignment */
uint32_t unused[3];
-} __attribute__ ((aligned (32)));
+};
/* Queue Head (QH). */
struct QH {
--
1.7.2.3
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Please pull u-boot-mpc85xx.git
Dear Kumar Gala,
In message you wrote:
> The following changes since commit 11c8dd36edcc82564a19dbd0103302df66d66db0:
>
> FAT: buffer overflow with FAT12/16 (2010-10-20 09:14:38 +0200)
>
> are available in the git repository at:
> git://git.denx.de/u-boot-mpc85xx master
>
> Aaron Sierra (1):
> 85xx: Add support for not releasing secondary cores via 'mp_holdoff'
>
> Kumar Gala (4):
> powerpc/fsl: Introduce common enum for PHY types
> powerpc/8xxx: Add fdt_fixup_phy_connection helper
> 86xx: Create common linker script
> Fix compile warning in uli526x driver
>
> Peter Tyser (6):
> mpc8641hpcn: Update PCI code
> sbc8641d: Update PCI code
> tqm85xx: Update PCI code
> mpc8640: Update the io_sel fields for PCI Express
> 86xx: Use gc-sections to reduce image size
> 85xx: Use gc-sections to reduce image size
>
> Timur Tabi (1):
> always relocate fdt into an lmb-allocated memory block
>
> York Sun (7):
> Adding more control to physical address mapping
> Add memory test feature for mpc85xx POST.
> Setup POST word for generic mpc85xx
> Enable POST memory test for corenet_ds
> Enable POST memory test for P2020DS
> Adding fixed sdram setting for cornet_ds board
> Disable unused chip-select for DDR controller interleaving
>
> arch/powerpc/cpu/mpc85xx/config.mk |4 +
> arch/powerpc/cpu/mpc85xx/cpu.c | 219
> arch/powerpc/cpu/mpc85xx/fdt.c | 22 +-
> arch/powerpc/cpu/mpc85xx/mp.c | 31 ++
> arch/powerpc/cpu/mpc85xx/mp.h |1 +
> arch/powerpc/cpu/mpc85xx/tlb.c | 16 +-
> arch/powerpc/cpu/mpc85xx/u-boot.lds| 52 +---
> arch/powerpc/cpu/mpc86xx/config.mk |7 +
> .../powerpc/cpu/mpc86xx}/u-boot.lds| 26 +-
> arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c | 17 +-
> arch/powerpc/cpu/mpc8xxx/fdt.c | 24 ++
> arch/powerpc/cpu/mpc8xxx/pci_cfg.c |5 +-
> arch/powerpc/include/asm/fsl_ddr_sdram.h |6 +
> arch/powerpc/include/asm/fsl_enet.h| 33 ++
> board/freescale/corenet_ds/Makefile|3 +-
> board/freescale/corenet_ds/corenet_ds.c| 15 -
> board/freescale/corenet_ds/ddr.c | 131 +++-
> board/freescale/corenet_ds/p4080ds_ddr.c | 356
>
> board/freescale/mpc8360emds/mpc8360emds.c | 15 +-
> board/freescale/mpc837xemds/mpc837xemds.c |8 +-
> board/freescale/mpc8569mds/mpc8569mds.c|4 +-
> board/freescale/mpc8610hpcd/u-boot.lds | 132
> board/freescale/mpc8641hpcn/mpc8641hpcn.c | 97 ++
> board/freescale/mpc8641hpcn/u-boot.lds | 133
> board/sbc8641d/sbc8641d.c | 103 ++-
> board/tqc/tqm85xx/law.c|4 +-
> board/tqc/tqm85xx/tlb.c| 10 +-
> board/tqc/tqm85xx/tqm85xx.c| 151 +++--
> board/xes/xpedite5170/u-boot.lds | 132
> common/image.c | 83 ++---
> doc/README.fsl-ddr | 14 +
> drivers/net/uli526x.c |5 +-
> drivers/qe/uec.c | 10 +-
> drivers/qe/uec.h | 20 +-
> drivers/qe/uec_phy.c |8 +-
> include/configs/P2020DS.h |5 +-
> include/configs/TQM85xx.h | 20 +-
> include/configs/corenet_ds.h | 61 +
> include/post.h |4 +-
> 39 files changed, 1059 insertions(+), 928 deletions(-)
> rename {board/sbc8641d => arch/powerpc/cpu/mpc86xx}/u-boot.lds (90%)
> create mode 100644 arch/powerpc/include/asm/fsl_enet.h
> create mode 100644 board/freescale/corenet_ds/p4080ds_ddr.c
> delete mode 100644 board/freescale/mpc8610hpcd/u-boot.lds
> delete mode 100644 board/freescale/mpc8641hpcn/u-boot.lds
> delete mode 100644 board/xes/xpedite5170/u-boot.lds
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de
NEW GRAND UNIFIED THEORY DISCLAIMER: The Manufacturer May Technically
Be Entitled to Claim That This Product Is Ten-Dimensional. However,
the Consumer Is Reminded That This Confers No Legal Rights Above and
Beyond Those Applicable to Three-Dimensional Objects, Since the Seven
New Dimensions Are "Rolled Up" into Such a Small "Area" That They
Cannot Be Detected.
_
Re: [U-Boot] Please pull u-boot-ppc4xx/master
Dear Stefan Roese, In message <201010201042.24780...@denx.de> you wrote: > The following changes since commit 11c8dd36edcc82564a19dbd0103302df66d66db0: > > FAT: buffer overflow with FAT12/16 (2010-10-20 09:14:38 +0200) > > are available in the git repository at: > git://www.denx.de/git/u-boot-ppc4xx.git master > > Stefan Roese (4): > ppc4xx: Change tsr/tcr macros to upper case > ppc4xx/POST: Add board specific UART POST test to lwmon5 > ppc4xx: Enable NOR flash support in sequoia_ramboot target > ppc4xx: Fix default environment for AMCC boards > > arch/powerpc/cpu/ppc4xx/cpu_init.c |8 > arch/powerpc/cpu/ppc4xx/interrupts.c |7 --- > arch/powerpc/cpu/ppc4xx/traps.c | 11 +-- > board/amcc/sequoia/sequoia.c |6 -- > include/configs/amcc-common.h| 15 ++- > include/configs/lwmon5.h | 11 +++ > post/tests.c |4 > 7 files changed, 26 insertions(+), 36 deletions(-) Thanks, applied. Um... I have a few more ppc4xx related patches on my list; could you please check about their state? Thanks. 8218 09/14 Stefan Roese [U-Boot] [PATCH] ppc4xx: POST UART: Use in/out_8() io-accessor functions http://article.gmane.org/gmane.comp.boot-loaders.u-boot/84391 8219 09/14 Stefan Roese [U-Boot] [PATCH] ppc4xx: UART: Use NS16550 struct instead of offset macros http://article.gmane.org/gmane.comp.boot-loaders.u-boot/84392 8526 09/20 Stefan Roese [PATCH v2] ppc4xx/fdt/flash: Change fdt_fixup_nor_flash_node() to not rely on cs size http://article.gmane.org/gmane.comp.boot-loaders.u-boot/84698 8570 09/21 Matthias Fuchs [U-Boot] [PATCH] ppx4xx: remove unused functionality for DU405 boards http://article.gmane.org/gmane.comp.boot-loaders.u-boot/84738 8747 09/23 Stefan Roese [U-Boot] [RFC PATCH] ppc4xx: Use gc-sections to reduce image size http://article.gmane.org/gmane.comp.boot-loaders.u-boot/84923 9591 10/05 Tim Rachman[U-Boot] ppc4xx:DDR SDRAM test http://article.gmane.org/gmane.comp.boot-loaders.u-boot/85766 Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "It's when they say 2 + 2 = 5 that I begin to argue."- Eric Pepke ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Pull request: u-boot-i2c
Dear Heiko Schocher, In message <4cbef038.5020...@denx.de> you wrote: > Hello Wolfgang, > > The following changes since commit 11c8dd36edcc82564a19dbd0103302df66d66db0: > > FAT: buffer overflow with FAT12/16 (2010-10-20 09:14:38 +0200) > > are available in the git repository at: > git://git.denx.de/u-boot-i2c.git master > > Steve Sakoman (4): > ARMV7: OMAP: I2C driver: Use same timeout value as linux kernel driver > ARMV7: OMAP: I2C driver: Restructure i2c_read_byte function > ARMV7: OMAP: I2C driver: Restructure i2c_write_byte function > ARMV7: OMAP: I2C driver: Restructure i2c_probe function > > drivers/i2c/omap24xx_i2c.c | 209 --- > 1 files changed, 117 insertions(+), 92 deletions(-) Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Calm down, it's *__only* ones and zeroes. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] Devkit8000: Adapt changes to ARM relocation support
Dear Thomas Weber, In message <1287409095-19645-1-git-send-email-we...@corscience.de> you wrote: > Fix compilation of Devkit8000 after introduction of > ARM relocation support. > > Signed-off-by: Thomas Weber > --- > board/timll/devkit8000/config.mk |2 +- > include/configs/devkit8000.h |3 +++ > 2 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/board/timll/devkit8000/config.mk > b/board/timll/devkit8000/config.mk > index 6bfcef7..7f7b0ea 100644 > --- a/board/timll/devkit8000/config.mk > +++ b/board/timll/devkit8000/config.mk > @@ -32,4 +32,4 @@ > # (mem base + reserved) > > # For use with external or internal boots. > -TEXT_BASE = 0x80e8 > +TEXT_BASE = 0x80008000 > diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h > index 2815771..bde8b0f 100644 > --- a/include/configs/devkit8000.h > +++ b/include/configs/devkit8000.h > @@ -306,4 +306,7 @@ extern unsigned int boot_flash_sec; > extern unsigned int boot_flash_type; > #endif > > +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 > +#define CONFIG_SYS_INIT_SP_ADDR(LOW_LEVEL_SRAM_STACK - > CONFIG_SYS_GBL_DATA_SIZE) Aplied (after adapting to recent rename TEXT_BASE => CONFIG_SYS_TEXT_BASE and after removing board/timll/devkit8000/config.mk) Sandeep, hope this is OK with you. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "I can call spirits from the vasty deep." "Why so can I, or so can any man; but will they come when you do call for them?" - Shakespeare, 1 King Henry IV, Act III, Scene I. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] ftrtc010.c : enhance code according to original datasheet
Dear Macpaul Lin, In message <1287490476-22544-1-git-send-email-macp...@andestech.com> you wrote: > Add missing codes according to original datasheet. > This patch also makes ftrtc010 could be adapted to PCLK and EXT_CLK. > > Signed-off-by: Macpaul Lin > --- > drivers/rtc/ftrtc010.c | 11 +++ > 1 files changed, 11 insertions(+), 0 deletions(-) Applied, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Computers make excellent and efficient servants, but I have no wish to serve under them. Captain, a starship also runs on loyalty to one man. And nothing can replace it or him. -- Spock, "The Ultimate Computer", stardate 4729.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] ICACHE in core initialization to improve u-boot boot time: Breaks booting with i2c code while executing in flash.
Dear Richard Retanubun, In message <4cbdc153.30...@ruggedcom.com> you wrote: > > It does not work on our platform (similar to MPC8360EMDS). I think this is > specific to our platform because > we need to initialize i2c and use i2c while still executing from flash in > checkboard()) to read and parse a board-id i2c-eeprom > to support a unified uboot binary for multiple board flavors. Many boards do that. Some keep the environment in I2C EEPROM as well. This should not collide ith instruction caches on. > Just an FYI mostly, I am okay with not having ICACHE for our board while in > uboot. > Just curious if you know of a reason from the limited explanation I've > provided. Check how your boot device (NOR flash) is mapped - make sure it has the BI (burst inhibit) bit set (or whatever it may be called on that CPU). > Also, as a general rule, does uboot accept hosting custom non-eval-platform > boards? Yes, of course. We have tons of them. > I'm tempted to mainline our code (mostly contained under > /board/$company_name/...) That is highly recommended, as it will make it much easier for you to keep the code working during the product's lifetime. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de "Life is a garment we continuously alter, but which never seems to fit." - David McCord ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2] Update TEXT_BASE to CONFIG_SYS_TEXT_BASE
Dear Sughosh Ganu, In message <1287538444-2162-1-git-send-email-urwithsugh...@gmail.com> you wrote: > This was missed out in a couple of files under nand_spl > > Signed-off-by: Sughosh Ganu > --- > V2: > Fix whitespace issues. > > nand_spl/nand_boot.c |3 ++- > nand_spl/nand_boot_fsl_nfc.c |3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) Thanks: Applying: Update TEXT_BASE to CONFIG_SYS_TEXT_BASE Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... No changes -- Patch already applied. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Cogito cogito ergo cogito sum - "I think that I think, therefore I think that I am." - Ambrose Bierce, "The Devil's Dictionary" ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
