Re: [U-Boot-Users] [PATCH 1/1] FIS: repare incorrect return value with ramdisk handling
Look good. Thanks, Michal Simek In message [EMAIL PROTECTED] you wrote: From: Michal Simek [EMAIL PROTECTED] Microblaze and PowerPC use boot_get_ramdisk for loading ramdisk to memory with checking return value. Return 0 means success. Return 1 means failed. Here is correspond part of code from bootm.c which check return code. ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_PPC, rd_data_start, rd_data_end); if (ret) goto error; Signed-off-by: Michal Simek [EMAIL PROTECTED] --- common/image.c | 16 1 files changed, 8 insertions(+), 8 deletions(-) As far as I can tell this is exactly the same patch as submitted earlier. I think this was just by mistake? I committed the first one - please check. Best regards, Wolfgang Denk - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] CPU PPC440x5 on Virtex5 FX
Hi Racardo, On Monday 14 July 2008, Ricardo Ribalda Delgado wrote: I'm back from short hollydays, so expect some patches in this week :). Some general questions: master or next: Shall I apply the patches to master or to next? Both have modifications from 2 days ago. next please. master is only for bug fixes now, since the merge window is closed. interrupts: I have been thinking about the irq handler and I am going to create this files: -interrupt.c (actual file) - common part -uic.c (new file) - uic part (extracted from interrupt.c) -xilinx_iic.c (new file) - Xilinx Irq handler xilinx_iic.c ??? This really sounds like I2C. Please choose a different name. The Makefile will select among uic.c or xilinx_iic.c Yes, this is possible. But IIRC then the microblaze CPU suport has the same or at least a similar interrupt handler. Isn't there a way to use some interrupt code on both CPU architectures? ml507: As you know I have been sending patches for the ml507 board. I will wait until this patch in accepted until I resend the ml507 patch. Is this ok? To clarify: You will wait to send the ml507 board support patches until the CPU interrupt stuff is accepted? Best regards, 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: [EMAIL PROTECTED] = - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] Regarding non-contiguous support for MMC in u-boot1.3.1
Hello, I'm working for non-contiguous clusters support for MMC in u-boot 1.3.1 source code for flashing the linux images. We have a u-boot,which is working for contiguous clusters in MMC. Anybody could clarify the following my doubts in u-boot 1)Is FAT16 support is present in this u-boot? 2)If yes,how to register the MMC device to support for FAT? 3)How we could read the FAT information for getting the next cluster? Regards, Naveen - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] [PATCH] I2C Monitor Chip ADT7460 support
From: Ricardo Ribalda Delgado [EMAIL PROTECTED] Add support to the ADT7460 Monitor Chip by Analog Devices. Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- drivers/hwmon/Makefile |1 + drivers/hwmon/adt7460.c | 86 +++ include/dtt.h |3 +- 3 files changed, 89 insertions(+), 1 deletions(-) create mode 100644 drivers/hwmon/adt7460.c diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index f09f145..7342b91 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -37,6 +37,7 @@ COBJS-$(CONFIG_DTT_DS1775) += ds1775.o COBJS-$(CONFIG_DTT_LM73) += lm73.o COBJS-$(CONFIG_DTT_LM75) += lm75.o COBJS-$(CONFIG_DTT_LM81) += lm81.o +COBJS-$(CONFIG_DTT_ADT7460) += adt7460.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/hwmon/adt7460.c b/drivers/hwmon/adt7460.c new file mode 100644 index 000..0239e82 --- /dev/null +++ b/drivers/hwmon/adt7460.c @@ -0,0 +1,86 @@ +/* +(C) Copyright 2008 +Ricado Ribalda-Universidad Autonoma de Madrid, [EMAIL PROTECTED] +This work has been supported by: Q-Technology http://qtec.com/ + +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, see http://www.gnu.org/licenses/. +*/ + +#include common.h +#include i2c.h +#include dtt.h + +#define ADT7460_ADDRESS0x2c +#define ADT7460_INVALID128 +#define ADT7460_CONFIG 0x40 +#define ADT7460_REM1_TEMP 0x25 +#define ADT7460_LOCAL_TEMP 0x26 +#define ADT7460_REM2_TEMP 0x27 + +int dtt_read(int sensor, int reg) +{ + u8 dir = reg; + u8 data; + + if (i2c_read(ADT7460_ADDRESS, dir, 1, data, 1) == -1) + return -1; + if (data == ADT7460_INVALID) + return -1; + + return data; +} + +int dtt_write(int sensor, int reg, int val) +{ + u8 dir = reg; + u8 data = val; + + if (i2c_write(ADT7460_ADDRESS, dir, 1, data, 1) == -1) + return -1; + + return 0; +} + +int dtt_init(void) +{ + puts(ADT7460 at I2C address 0x%2x\n, ADT7460_ADDRESS); + + if (dtt_write(0, ADT7460_CONFIG, 1) == -1) { + puts(Error initialiting ADT7460\n); + return -1; + } + + return 0; +} + +int dtt_get_temp(int sensor) +{ + int aux; + u8 table[] = + { ADT7460_REM1_TEMP, ADT7460_LOCAL_TEMP, ADT7460_REM2_TEMP }; + + if (sensor 2) { + puts(DTT sensor does not exist\n); + return -1; + } + + aux = dtt_read(0, table[sensor]); + if (aux == -1) { + puts(DTT temperature read failed\n); + return -1; + + } + + return aux; +} diff --git a/include/dtt.h b/include/dtt.h index 34053d1..ce0fdfa 100644 --- a/include/dtt.h +++ b/include/dtt.h @@ -32,7 +32,8 @@ defined(CONFIG_DTT_DS1775) || \ defined(CONFIG_DTT_LM81) || \ defined(CONFIG_DTT_ADM1021) || \ -defined(CONFIG_DTT_LM73) +defined(CONFIG_DTT_LM73) || \ +defined(CONFIG_DTT_ADT7460) #define CONFIG_DTT /* We have a DTT */ -- 1.5.6.2 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] mpc85xx: make the MxMR register in upmconfig as a parameter
The default value for the MxMR register is not always the right one. This patch adds the value of MxMR register as an additional parameter (plus a few defines instead of hex coded values). Signed-off-by: Sebastian Siewior [EMAIL PROTECTED] --- cpu/mpc85xx/cpu.c | 17 +++-- include/common.h |4 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c index 2373b4a..081e804 100644 --- a/cpu/mpc85xx/cpu.c +++ b/cpu/mpc85xx/cpu.c @@ -314,16 +314,21 @@ int dma_xfer(void *dest, uint count, void *src) { return dma_check(); } #endif + +#define MXMR_OP_NORMAL (0x) +#define MXMR_OP_WRITE (0x1000) +#define MXMR_OP_READ (0x2000) +#define MXMR_OP_RUN(0x3000) + /* - * Configures a UPM. Currently, the loop fields in MxMR (RLF, WLF and TLF) - * are hardcoded as 1.size is the number or entries, not a sizeof. + * Configures a UPM. The MxMR mode is the fourth parameter. + * size is the number or entries, not a sizeof. */ -void upmconfig (uint upm, uint * table, uint size) +void upmconfig(uint upm, uint *table, uint size, unsigned int mxmr_mode) { int i, mdr, mad, old_mad = 0; volatile u32 *mxmr; volatile ccsr_lbc_t *lbc = (void *)(CFG_MPC85xx_LBC_ADDR); - int loopval = 0x4440; volatile u32 *brp,*orp; volatile u8* dummy = NULL; int upmmask; @@ -364,7 +369,7 @@ void upmconfig (uint upm, uint * table, uint size) for (i = 0; i size; i++) { /* 1 */ - out_be32(mxmr, loopval | 0x1000 | i); /* OP_WRITE */ + out_be32(mxmr, mxmr_mode | MXMR_OP_WRITE | i); /* 2 */ out_be32(lbc-mdr, table[i]); /* 3 */ @@ -377,5 +382,5 @@ void upmconfig (uint upm, uint * table, uint size) } while (mad = old_mad !(!mad i == (size-1))); old_mad = mad; } - out_be32(mxmr, loopval); /* OP_NORMAL */ + out_be32(mxmr, mxmr_mode | MXMR_OP_NORMAL); } diff --git a/include/common.h b/include/common.h index 10b997e..0c0ef5b 100644 --- a/include/common.h +++ b/include/common.h @@ -441,7 +441,11 @@ void ppcDWstore(unsigned int *addr, unsigned int *value); intcheckcpu (void); intcheckicache (void); intcheckdcache (void); +#ifdef CONFIG_MPC85xx +void upmconfig (unsigned int, unsigned int *, unsigned int, unsigned int); +#else void upmconfig (unsigned int, unsigned int *, unsigned int); +#endif ulong get_tbclk (void); void reset_cpu (ulong addr); #if defined (CONFIG_OF_LIBFDT) defined (CONFIG_OF_BOARD_SETUP) -- 1.5.5.2 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] CPU PPC440x5 on Virtex5 FX
In message [EMAIL PROTECTED] you wrote: You are right, but I cannot see how to share code between architechtures... If WD don't have a good idea we should have here the xilinx iic code repeated. No. Duplicating code is never a good idea. 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: [EMAIL PROTECTED] The trouble with our times is that the future is not what it used to be. - Paul Valery - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] CPU PPC440x5 on Virtex5 FX
Hi Ricardo, Hi Michal I am trying to solve the xilinx irq I have some questions: 1) Where can I find the official u-boot bsp for edk? http://git.monstr.eu/ is dead yes. git.monstr.eu was temporary down because I was changing my servers. currently is server up. 2) Do we really need a new bsp for this? Can't we just use the Linux_2_6. I just need a couple of definitions... No. we don't need new BSP for this. The BSP exists more than year. http://git.monstr.eu/cgi-bin/gitweb.cgi?p=u-boot-bsp.git;a=summary and description is at: http://www.monstr.eu/wiki/doku.php?id=uboot:uboot Could you send me your mhs and mss file? I'll add it to u-boot bsp and I send you bsp and output. Thanks, Michal Best Regards -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] CPU PPC440x5 on Virtex5 FX
You are right, but I cannot see how to share code between architechtures... If WD don't have a good idea we should have here the xilinx iic code repeated. No. Duplicating code is never a good idea. I agree. Michal Best regards, Wolfgang Denk - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 0/1] vsprintf: add z and t options
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD [EMAIL PROTECTED] --- lib_generic/vsprintf.c | 12 +--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib_generic/vsprintf.c b/lib_generic/vsprintf.c index 3db6c3f..1d9b25b 100644 --- a/lib_generic/vsprintf.c +++ b/lib_generic/vsprintf.c @@ -262,7 +262,9 @@ int vsprintf(char *buf, const char *fmt, va_list args) /* get the conversion qualifier */ qualifier = -1; - if (*fmt == 'h' || *fmt == 'l' || *fmt == 'q') { + if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || + *fmt =='Z' || *fmt == 'z' || *fmt == 't' || + *fmt == 'q' ) { qualifier = *fmt; if (qualifier == 'l' *(fmt+1) == 'l') { qualifier = 'q'; @@ -355,9 +357,13 @@ int vsprintf(char *buf, const char *fmt, va_list args) num = va_arg(args, unsigned long long); else #endif - if (qualifier == 'l') + if (qualifier == 'l') { num = va_arg(args, unsigned long); - else if (qualifier == 'h') { + } else if (qualifier == 'Z' || qualifier == 'z') { + num = va_arg(args, size_t); + } else if (qualifier == 't') { + num = va_arg(args, ptrdiff_t); + } else if (qualifier == 'h') { num = (unsigned short) va_arg(args, int); if (flags SIGN) num = (short) num; -- 1.5.6 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 1/1] Fix some more printf() format issues.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD [EMAIL PROTECTED] --- common/cmd_flash.c |4 ++-- drivers/usb/usbdcore.c |2 +- fs/jffs2/jffs2_1pass.c |4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/cmd_flash.c b/common/cmd_flash.c index 9bd8074..d959c3d 100644 --- a/common/cmd_flash.c +++ b/common/cmd_flash.c @@ -342,7 +342,7 @@ int do_flerase (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) puts (Bad sector specification\n); return 1; } - printf (Erase Flash Sectors %d-%d in Bank # %d , + printf (Erase Flash Sectors %d-%d in Bank # %zu , sect_first, sect_last, (info-flash_info)+1); rcode = flash_erase(info, sect_first, sect_last); return rcode; @@ -534,7 +534,7 @@ int do_protect (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) puts (Bad sector specification\n); return 1; } - printf(%sProtect Flash Sectors %d-%d in Bank # %d\n, + printf(%sProtect Flash Sectors %d-%d in Bank # %zu\n, p ? : Un-, sect_first, sect_last, (info-flash_info)+1); for (i = sect_first; i = sect_last; i++) { diff --git a/drivers/usb/usbdcore.c b/drivers/usb/usbdcore.c index 808da9f..53ed669 100644 --- a/drivers/usb/usbdcore.c +++ b/drivers/usb/usbdcore.c @@ -552,7 +552,7 @@ struct urb *usbd_alloc_urb (struct usb_device_instance *device, struct urb *urb; if (!(urb = (struct urb *) malloc (sizeof (struct urb { - usberr ( F A T A L: malloc(%u) FAILED, + usberr ( F A T A L: malloc(%zu) FAILED, sizeof (struct urb)); return NULL; } diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 5c1d265..3c454f6 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -1213,12 +1213,12 @@ jffs2_1pass_build_lists(struct part_info * part) } else if (node-nodetype == JFFS2_NODETYPE_CLEANMARKER) { if (node-totlen != sizeof(struct jffs2_unknown_node)) printf(OOPS Cleanmarker has bad size - %d != %u\n, node-totlen, + %d != %zu\n, node-totlen, sizeof(struct jffs2_unknown_node)); } else if (node-nodetype == JFFS2_NODETYPE_PADDING) { if (node-totlen sizeof(struct jffs2_unknown_node)) printf(OOPS Padding has bad size - %d %u\n, node-totlen, + %d %zu\n, node-totlen, sizeof(struct jffs2_unknown_node)); } else { printf(Unknown node type: %x len %d -- 1.5.6 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] CPU PPC440x5 on Virtex5 FX
Hi Michal I am trying to solve the xilinx irq I have some questions: 1) Where can I find the official u-boot bsp for edk? http://git.monstr.eu/ is dead 2) Do we really need a new bsp for this? Can't we just use the Linux_2_6. I just need a couple of definitions... Best Regards -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] PATCH for U-Boot 1.3.3 DHCP fails with netgear WGR614v6
Foreword: As Wolfgang noted, Robin's emails apparently are being discarded by Sourceforge. I'm dual-subscribed - home and work - and only received emails from Robin on the email that was directly addressed to me. Robin Getz wrote: On Fri 11 Jul 2008 14:52, Jerry Van Baren pondered: Ben Warren wrote: Robin Getz wrote: I was trying out U-Boot 1.1.3 with a new(er) router netgear WGR614v6 - firmware version V2.0.19_1.0.19NA, on a Blackfin BF537-STAMP. http://kbserver.netgear.com/products/wgr614v6.asp and found that dhcp fails :( bfin dhcp BOOTP broadcast 1 BOOTP broadcast 2 BOOTP broadcast 3 BOOTP broadcast 4 BOOTP broadcast 5 Retry count exceeded; starting again When turning on some more verbose debug messages (in the net driver in the network code, not all of which exists in U-Boot release or trunk), we can see exactly what is going on... = First DHCP request... bfin dhcp Eth_halt: .. Eth_init: .. BOOTP broadcast 1 setting transaction ID to 3268fe22 BFIN EMAC send: length = 343 BFIN EMAC rx: length = 552 packet received packet received Receive from protocol 0x800 Got IP len=308, v=45 passing packet len= 280 DHCPHandler: got packet: (src=67, dst=68, len=280) state: 3 Filtering pkt = 0 DHCPHandler: got DHCP packet: (src=67, dst=68, len=280) state: 3 DHCP: state=SELECTING bp_file: TRANSITIONING TO REQUESTING STATE IP was: 0.0.0.0 IP now: 192.168.0.9 ...worked. No - the DCHP server offered an address, When U-Boot does a DHCPREQUEST (confirming it can have that address) it gets a DHCP NAK. Right. My confusion. Bootfile: DhcpSendRequestPkt: Sending DHCPREQUEST Why is the second DHCP request being sent? This is not a 2nd DHCP request being sent. This is part of the DHCP protocol. Right. My confusion. What is the second DHCP request asking for (sniff the net with wireshark). I can send you the wireshark file, but it is exactly as I described. http://www.ietf.org/rfc/rfc1533.txt Client sends DHCPDISCOVER server sends DHCPOFFER Client sends DHCPREQUEST Server sends ARP Client responds to ARP before it should Server sends DHCPNAK, because someone on the network is using the IP number (and doesn't bother to check the MAC - and notice that is the machine that it just gave the IP number to). Clients tosses the offer info (it did get NAKed), and starts over. RFC-1533 is DHCP Options and BOOTP Vendor Extensions. RFC-2131 Dynamic Host Configuration Protocol appears to be the right RFC. The above sequence is somewhat odd and I would contend that it should be classified as a DHCP server bug. Quoting from RFC-2131: - 2.2 Dynamic allocation of network addresses [snip] As a consistency check, the allocating server SHOULD probe the reused address *before* allocating the address, e.g., with an ICMP echo request, and the client SHOULD probe the newly received address, e.g., with ARP. - My emphasis on the word *before*. The Netgear is apparently probing *after* allocating the IP address and then *withdrawing* it's allocation when u-boot (improperly) responds to the ARP (the ARP is probably is a side effect of a ICMP probe). This would explain why we have not been bitten by this bug before. Of course u-boot needs to abide by Postel's Prescription: Be liberal in what you accept, and conservative in what you send. http://www.postel.org/postel.html IMHO, the Netgear WGR614v6 bug triggered a u-boot bug, for which we have a proposed/accepted (applied?) bug fix. [snip] Best regards, gvb - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 0/1] vsprintf: add z and t options
In message [EMAIL PROTECTED] you wrote: Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD [EMAIL PROTECTED] --- lib_generic/vsprintf.c | 12 +--- 1 files changed, 9 insertions(+), 3 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: [EMAIL PROTECTED] The optimum committee has no members. - Norman Augustine - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 1/1] v2: coding style cleaning for sc520_spunk
Hi Jean, From: Michal Simek [EMAIL PROTECTED] there are some long lines in config file but this patches clean a lot of coding style issues There could be small problem with Daniel name. Please check it in merge Signed-off-by: Michal Simek [EMAIL PROTECTED] --- include/configs/sc520_spunk.h | 138 +++-- 1 files changed, 63 insertions(+), 75 deletions(-) diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h index 051b2e0..179ecdf 100644 --- a/include/configs/sc520_spunk.h +++ b/include/configs/sc520_spunk.h @@ -1,6 +1,6 @@ /* * (C) Copyright 2002 - * Daniel Engstr?m, Omicron Ceti AB, [EMAIL PROTECTED] + * Daniel Engstr�m, Omicron Ceti AB, [EMAIL PROTECTED] * * See file CREDITS for list of people who contributed to this * project. @@ -12,7 +12,7 @@ * * 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 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Please do not modify generic licence header This is absurd tab in header which should be removed from all licenses in U-BOOT. * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -33,38 +33,36 @@ * (easy to change) */ #define CONFIG_BOOTDELAY 15 -#define CONFIG_BOOTARGSroot=/dev/mtdblock1 console=ttyS0,9600 \ - mtdparts=phys:7936k(root),256k(uboot) -#define CONFIG_BOOTCOMMAND setenv bootargs root=/dev/nfs ip=autoconf \ - console=ttyS0,9600 \ - mtdparts=phys:7808k(root),128k(env),256k(uboot); \ - bootp;bootm +#define CONFIG_BOOTARGSroot=/dev/mtdblock1 console=ttyS0,9600 mtdparts=phys:7936k(root),256k(uboot) +#define CONFIG_BOOTCOMMAND setenv bootargs root=/dev/nfs ip=autoconf console=ttyS0,9600 mtdparts=phys:7808k(root),128k(env),256k(uboot); bootp; bootm too long, please let the previous way I know there are some long lines. M #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #endif Please be carreful about the 80 characters limits Best Regards, J. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 1/1] v2: coding style cleaning for sc520_spunk
In message [EMAIL PROTECTED] you wrote: + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the Please do not modify generic licence header This is absurd tab in header which should be removed from all licenses = in U-BOOT. Why? Does it hurt anybody? I know there are some long lines. Then cut it, dear Liza, dear Liza, ... 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: [EMAIL PROTECTED] Extreme feminine beauty is always disturbing. -- Spock, The Cloud Minders, stardate 5818.4 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] CPU PPC440x5 on Virtex5 FX
Hello All: I am preparing a patch for ppc.c that divides interrupts.c in interrupts.c and ioc.c. My idea was to add a new file called xilinx_irq.c and place there the xilinx interrupt handling. I would like that microblaze and xilinx_irq.c use the same code: but I see this quite complicated. I can create a file with the xilinx irq logic (init, enable, disable and ack) but I cannot see where shall I place it if there is no drivers/interrupt/ directory One more question: interrupts/microblace access the pic registers like: address=PIC; pic=value; If I create a new file, I suppose that I have to move it to out_be32() and in_be32(). Am I right? Best regards -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] Fix some more printf() format problems.
Signed-off-by: Kumar Gala [EMAIL PROTECTED] --- common/cmd_mp.c |2 +- cpu/mpc85xx/mp.c |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/cmd_mp.c b/common/cmd_mp.c index 26a57c5..59d0d15 100644 --- a/common/cmd_mp.c +++ b/common/cmd_mp.c @@ -35,7 +35,7 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) cpuid = simple_strtoul(argv[1], NULL, 10); if (cpuid = CONFIG_NR_CPUS) { - printf (Core num: %d is out of range[0..%d]\n, + printf (Core num: %ld is out of range[0..%d]\n, cpuid, CONFIG_NR_CPUS - 1); return 1; } diff --git a/cpu/mpc85xx/mp.c b/cpu/mpc85xx/mp.c index a527cf3..75ceba9 100644 --- a/cpu/mpc85xx/mp.c +++ b/cpu/mpc85xx/mp.c @@ -50,12 +50,12 @@ int cpu_status(int nr) if (nr == id) { table = (u32 *)get_spin_addr(); - printf(table base @ 0x%08x\n, table); + printf(table base @ 0x%08x\n, (u32)table); } else { table = (u32 *)get_spin_addr() + nr * NUM_BOOT_ENTRY; printf(Running on cpu %d\n, id); printf(\n); - printf(table @ 0x%08x:\n, table); + printf(table @ 0x%08x:\n, (u32)table); printf( addr - 0x%08x\n, table[BOOT_ENTRY_ADDR_LOWER]); printf( pir - 0x%08x\n, table[BOOT_ENTRY_PIR]); printf( r3 - 0x%08x\n, table[BOOT_ENTRY_R3_LOWER]); -- 1.5.5.1 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] Fix integer overflow warning in calc_divisor()
On Sun, 2008-07-13 at 15:14 +0200, Wolfgang Denk wrote: In message [EMAIL PROTECTED] you wrote: Fix the integer overflow warning when rounding the serial port clock divisor value in calc_divisor(). Signed-off-by: Hugo Villeneuve [EMAIL PROTECTED] --- drivers/serial/serial.c | 11 +-- 1 files changed, 9 insertions(+), 2 deletions(-) Applied, thanks, but I really wish you had kept the subject unchanged, and ideally even threading correct. Hi Wolfgang, since you already applied the first patch, I simply thought that the fix for the first patch should have a different subject. I will keep the same subject in the future Hugo V. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] Fix some more printf() format problems.
On 09:42 Mon 14 Jul , Kumar Gala wrote: Signed-off-by: Kumar Gala [EMAIL PROTECTED] --- common/cmd_mp.c |2 +- cpu/mpc85xx/mp.c |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/cmd_mp.c b/common/cmd_mp.c index 26a57c5..59d0d15 100644 --- a/common/cmd_mp.c +++ b/common/cmd_mp.c @@ -35,7 +35,7 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) cpuid = simple_strtoul(argv[1], NULL, 10); if (cpuid = CONFIG_NR_CPUS) { - printf (Core num: %d is out of range[0..%d]\n, + printf (Core num: %ld is out of range[0..%d]\n, is it not %lu? cpuid is a unsigned long. cpuid, CONFIG_NR_CPUS - 1); return 1; } diff --git a/cpu/mpc85xx/mp.c b/cpu/mpc85xx/mp.c index a527cf3..75ceba9 100644 --- a/cpu/mpc85xx/mp.c +++ b/cpu/mpc85xx/mp.c @@ -50,12 +50,12 @@ int cpu_status(int nr) if (nr == id) { table = (u32 *)get_spin_addr(); - printf(table base @ 0x%08x\n, table); + printf(table base @ 0x%08x\n, (u32)table); why not use %p? it's a pointer. } else { table = (u32 *)get_spin_addr() + nr * NUM_BOOT_ENTRY; printf(Running on cpu %d\n, id); printf(\n); - printf(table @ 0x%08x:\n, table); + printf(table @ 0x%08x:\n, (u32)table); same. printf( addr - 0x%08x\n, table[BOOT_ENTRY_ADDR_LOWER]); printf( pir - 0x%08x\n, table[BOOT_ENTRY_PIR]); printf( r3 - 0x%08x\n, table[BOOT_ENTRY_R3_LOWER]); -- 1.5.5.1 Best Regards, J. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] I2C Monitor Chip ADT7460 support (new version)
-Add support to the ADT7460 Monitor Chip by Analog Devices. -Correct wrong previous coding style -Correct previous use of puts Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- drivers/hwmon/Makefile |1 + drivers/hwmon/adt7460.c | 86 +++ include/dtt.h |3 +- 3 files changed, 89 insertions(+), 1 deletions(-) create mode 100644 drivers/hwmon/adt7460.c diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index f09f145..7342b91 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -37,6 +37,7 @@ COBJS-$(CONFIG_DTT_DS1775) += ds1775.o COBJS-$(CONFIG_DTT_LM73) += lm73.o COBJS-$(CONFIG_DTT_LM75) += lm75.o COBJS-$(CONFIG_DTT_LM81) += lm81.o +COBJS-$(CONFIG_DTT_ADT7460) += adt7460.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/hwmon/adt7460.c b/drivers/hwmon/adt7460.c new file mode 100644 index 000..197d86c --- /dev/null +++ b/drivers/hwmon/adt7460.c @@ -0,0 +1,86 @@ +/* +(C) Copyright 2008 +Ricado Ribalda-Universidad Autonoma de Madrid, [EMAIL PROTECTED] +This work has been supported by: Q-Technology http://qtec.com/ + +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, see http://www.gnu.org/licenses/. +*/ + +#include common.h +#include i2c.h +#include dtt.h + +#define ADT7460_ADDRESS0x2c +#define ADT7460_INVALID128 +#define ADT7460_CONFIG 0x40 +#define ADT7460_REM1_TEMP 0x25 +#define ADT7460_LOCAL_TEMP 0x26 +#define ADT7460_REM2_TEMP 0x27 + +int dtt_read(int sensor, int reg) +{ + u8 dir = reg; + u8 data; + + if (i2c_read(ADT7460_ADDRESS, dir, 1, data, 1) == -1) + return -1; + if (data == ADT7460_INVALID) + return -1; + + return data; +} + +int dtt_write(int sensor, int reg, int val) +{ + u8 dir = reg; + u8 data = val; + + if (i2c_write(ADT7460_ADDRESS, dir, 1, data, 1) == -1) + return -1; + + return 0; +} + +int dtt_init(void) +{ + printf(ADT7460 at I2C address 0x%2x\n, ADT7460_ADDRESS); + + if (dtt_write(0, ADT7460_CONFIG, 1) == -1) { + puts(Error initialiting ADT7460\n); + return -1; + } + + return 0; +} + +int dtt_get_temp(int sensor) +{ + int aux; + u8 table[] = + { ADT7460_REM1_TEMP, ADT7460_LOCAL_TEMP, ADT7460_REM2_TEMP }; + + if (sensor 2) { + puts(DTT sensor does not exist\n); + return -1; + } + + aux = dtt_read(0, table[sensor]); + if (aux == -1) { + puts(DTT temperature read failed\n); + return -1; + + } + + return aux; +} diff --git a/include/dtt.h b/include/dtt.h index 34053d1..ce0fdfa 100644 --- a/include/dtt.h +++ b/include/dtt.h @@ -32,7 +32,8 @@ defined(CONFIG_DTT_DS1775) || \ defined(CONFIG_DTT_LM81) || \ defined(CONFIG_DTT_ADM1021) || \ -defined(CONFIG_DTT_LM73) +defined(CONFIG_DTT_LM73) || \ +defined(CONFIG_DTT_ADT7460) #define CONFIG_DTT /* We have a DTT */ -- 1.5.6.2 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] Fix some more printf() format problems.
On Jul 14, 2008, at 10:09 AM, Jean-Christophe PLAGNIOL-VILLARD wrote: On 09:42 Mon 14 Jul , Kumar Gala wrote: Signed-off-by: Kumar Gala [EMAIL PROTECTED] --- common/cmd_mp.c |2 +- cpu/mpc85xx/mp.c |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/cmd_mp.c b/common/cmd_mp.c index 26a57c5..59d0d15 100644 --- a/common/cmd_mp.c +++ b/common/cmd_mp.c @@ -35,7 +35,7 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) cpuid = simple_strtoul(argv[1], NULL, 10); if (cpuid = CONFIG_NR_CPUS) { -printf (Core num: %d is out of range[0..%d]\n, +printf (Core num: %ld is out of range[0..%d]\n, is it not %lu? cpuid is a unsigned long. probably. cpuid, CONFIG_NR_CPUS - 1); return 1; } diff --git a/cpu/mpc85xx/mp.c b/cpu/mpc85xx/mp.c index a527cf3..75ceba9 100644 --- a/cpu/mpc85xx/mp.c +++ b/cpu/mpc85xx/mp.c @@ -50,12 +50,12 @@ int cpu_status(int nr) if (nr == id) { table = (u32 *)get_spin_addr(); -printf(table base @ 0x%08x\n, table); +printf(table base @ 0x%08x\n, (u32)table); why not use %p? it's a pointer. do we support %p in u-boot? - k - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH v2] Update Freescale sys_eeprom.c to handle CCID formats
Jon, are you planning on picking this up? It is mostly an 86xx fix, since only 86xx uses sys_eeprom.c. Timur Tabi wrote: Timur Tabi wrote: Update the sys_eeprom.c file to handle both NXID and CCID EEPROM formats. The NXID format replaces the older CCID format, but it's important to support both since most boards out there still use the CCID format. This change is in preparation for using one file to handle both formats. This will also unify EEPROM support for all Freescale 85xx and 86xx boards. Also update the 86xx board header files to use the standard CFG_I2C_EEPROM_ADDR instead of ID_EEPROM_ADDR. Signed-off-by: Timur Tabi [EMAIL PROTECTED] --- Jon, if you have no objections, would you please pick up this patch? -- Timur Tabi Linux kernel developer at Freescale - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH, resend] FDT memory and pci node fixes for MPC8260ADS
+#if defined(CONFIG_OF_LIBFDT) +void ft_pci_setup(void *blob, bd_t *bd) +{ + do_fixup_by_prop_u32(blob, device_type, pci, 4, + clock-frequency, bd-pci_clk, 1); +} +#endif Your patch causes problems: Configuring for MPC8260ADS board... pci.c: In function 'ft_pci_setup': pci.c:460: error: 'bd_t' has no member named 'pci_clk' make[1]: *** [pci.o] Error 1 Do you have a quick fix or shall I back out the patch? This problem can be temporary fixed with replacement of the gd-pci_clk by CONFIG_8260_CLKIN. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] CPU PPC440x5 on Virtex5 FX
-Support for the embbedded ppc440 on the Virtex5 FPGAs -New uic.c and xilinx_irq.c external interrupt handlers - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] CPU PPC440x5 on Virtex5 FX
-Support for the embbedded ppc440 on the Virtex5 FPGAs -New uic.c and xilinx_irq.c external interrupt handlers Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- cpu/ppc4xx/Makefile | 15 +++- cpu/ppc4xx/cpu.c|4 + cpu/ppc4xx/interrupts.c | 178 ++--- cpu/ppc4xx/speed.c |6 +- cpu/ppc4xx/uic.c| 238 +++ cpu/ppc4xx/xilinx_irq.c | 115 + include/asm-ppc/interrupt.h | 51 + include/asm-ppc/processor.h |2 + 8 files changed, 459 insertions(+), 150 deletions(-) create mode 100644 cpu/ppc4xx/uic.c create mode 100644 cpu/ppc4xx/xilinx_irq.c create mode 100644 include/asm-ppc/interrupt.h diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile index 800bb41..b006127 100644 --- a/cpu/ppc4xx/Makefile +++ b/cpu/ppc4xx/Makefile @@ -35,10 +35,14 @@ SOBJS += kgdb.o COBJS := 40x_spd_sdram.o COBJS += 44x_spd_ddr.o COBJS += 44x_spd_ddr2.o -COBJS += 4xx_enet.o +ifndef CONFIG_XILINX_440 +COBJS += 4xx_enet.o +endif COBJS += 4xx_pci.o COBJS += 4xx_pcie.o +ifndef CONFIG_XILINX_440 COBJS += 4xx_uart.o +endif COBJS += bedbug_405.o COBJS += commproc.o COBJS += cpu.o @@ -47,11 +51,20 @@ COBJS += denali_data_eye.o COBJS += denali_spd_ddr2.o COBJS += ecc.o COBJS += fdt.o +ifndef CONFIG_XILINX_440 COBJS += gpio.o +endif COBJS += i2c.o COBJS += interrupts.o +ifndef CONFIG_XILINX_440 +COBJS += uic.o +else +COBJS += xilinx_irq.o +endif COBJS += iop480_uart.o +ifndef CONFIG_XILINX_440 COBJS += miiphy.o +endif COBJS += ndfc.o COBJS += sdram.o COBJS += speed.o diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index ef32bc6..2b9b364 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -541,6 +541,10 @@ int checkcpu (void) puts(GX Rev. A); strcpy(addstr, No Security support); break; + + case PVR_VIRTEX5: + puts( VIRTEX5); + break; default: printf ( UNKNOWN (PVR=%08x), pvr); diff --git a/cpu/ppc4xx/interrupts.c b/cpu/ppc4xx/interrupts.c index 8215dc6..58d1d81 100644 --- a/cpu/ppc4xx/interrupts.c +++ b/cpu/ppc4xx/interrupts.c @@ -8,6 +8,10 @@ * (C) Copyright 2003 (440GX port) * Travis B. Sawyer, Sandburst Corporation, [EMAIL PROTECTED] * + * (C) Copyright 2008 (PPC440X05 port for Virtex 5 FX) + * Ricardo Ribalda-Universidad Autonoma de [EMAIL PROTECTED] + * Work supported by Qtechnology (htpp://qtec.com) + * * See file CREDITS for list of people who contributed to this * project. * @@ -31,23 +35,11 @@ #include watchdog.h #include command.h #include asm/processor.h +#include asm/interrupt.h #include ppc4xx.h #include ppc_asm.tmpl #include commproc.h -#if (UIC_MAX 3) -#define UICB0_ALL (UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI) | \ -UIC_MASK(VECNUM_UIC2CI) | UIC_MASK(VECNUM_UIC2NCI) | \ -UIC_MASK(VECNUM_UIC3CI) | UIC_MASK(VECNUM_UIC3NCI)) -#elif (UIC_MAX 2) -#define UICB0_ALL (UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI) | \ -UIC_MASK(VECNUM_UIC2CI) | UIC_MASK(VECNUM_UIC2NCI)) -#elif (UIC_MAX 1) -#define UICB0_ALL (UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI)) -#else -#define UICB0_ALL 0 -#endif - DECLARE_GLOBAL_DATA_PTR; /* @@ -58,11 +50,7 @@ struct irq_action { void *arg; int count; }; - -static struct irq_action irq_vecs[UIC_MAX * 32]; - -u32 get_dcr(u16); -void set_dcr(u16, u32); +static struct irq_action irq_vecs[IRQ_MAX]; #if defined(CONFIG_440) @@ -103,7 +91,7 @@ int interrupt_init_cpu (unsigned *decrementer_count) /* * Mark all irqs as free */ - for (vec = 0; vec (UIC_MAX * 32); vec++) { + for (vec = 0; vec IRQ_MAX; vec++) { irq_vecs[vec].handler = NULL; irq_vecs[vec].arg = NULL; irq_vecs[vec].count = 0; @@ -147,110 +135,36 @@ int interrupt_init_cpu (unsigned *decrementer_count) */ set_evpr(0x); -#if (UIC_MAX 1) - /* Install the UIC1 handlers */ - irq_install_handler(VECNUM_UIC1NCI, (void *)(void *)external_interrupt, 0); - irq_install_handler(VECNUM_UIC1CI, (void *)(void *)external_interrupt, 0); -#endif -#if (UIC_MAX 2) - irq_install_handler(VECNUM_UIC2NCI, (void *)(void *)external_interrupt, 0); - irq_install_handler(VECNUM_UIC2CI, (void *)(void *)external_interrupt, 0); -#endif -#if (UIC_MAX 3) - irq_install_handler(VECNUM_UIC3NCI, (void *)(void *)external_interrupt, 0); - irq_install_handler(VECNUM_UIC3CI, (void *)(void *)external_interrupt, 0); -#endif + /* +*Call uic or xilinx_irq pic_enable +*/ + pic_enable(); return (0); } -/* Handler for UIC interrupt */ -static void uic_interrupt(u32 uic_base, int vec_base) +void
Re: [U-Boot-Users] [PATCH] Fix some more printf() format problems.
cpuid, CONFIG_NR_CPUS - 1); return 1; } diff --git a/cpu/mpc85xx/mp.c b/cpu/mpc85xx/mp.c index a527cf3..75ceba9 100644 --- a/cpu/mpc85xx/mp.c +++ b/cpu/mpc85xx/mp.c @@ -50,12 +50,12 @@ int cpu_status(int nr) if (nr == id) { table = (u32 *)get_spin_addr(); - printf(table base @ 0x%08x\n, table); + printf(table base @ 0x%08x\n, (u32)table); why not use %p? it's a pointer. do we support %p in u-boot? yes we support it. Best Regards, J. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] CPU PPC440x5 on Virtex5 FX
Hello List: I have prepared this patch as preliminar/beta. The interrupt.c has been divided in two parts: - Code undependent to the pic (interrupt.c) -Code dependent to the pic (uic.c and xilinx_irq.c) The code in xilinx_irq.c can be reused by any other architechture. Any comment about this code will be very wellcomed. Regards -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] I2C Monitor Chip ADT7460 support (new version)
On 17:26 Mon 14 Jul , Ricardo Ribalda Delgado wrote: -Add support to the ADT7460 Monitor Chip by Analog Devices. -Correct wrong previous coding style -Correct previous use of puts please add this comment after the --- Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- drivers/hwmon/Makefile |1 + drivers/hwmon/adt7460.c | 86 +++ include/dtt.h |3 +- 3 files changed, 89 insertions(+), 1 deletions(-) create mode 100644 drivers/hwmon/adt7460.c diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index f09f145..7342b91 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -37,6 +37,7 @@ COBJS-$(CONFIG_DTT_DS1775) += ds1775.o COBJS-$(CONFIG_DTT_LM73) += lm73.o COBJS-$(CONFIG_DTT_LM75) += lm75.o COBJS-$(CONFIG_DTT_LM81) += lm81.o +COBJS-$(CONFIG_DTT_ADT7460) += adt7460.o COBJS:= $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/hwmon/adt7460.c b/drivers/hwmon/adt7460.c new file mode 100644 index 000..197d86c --- /dev/null +++ b/drivers/hwmon/adt7460.c @@ -0,0 +1,86 @@ +/* ^^^ please remove whitespace +(C) Copyright 2008 +Ricado Ribalda-Universidad Autonoma de Madrid, [EMAIL PROTECTED] +This work has been supported by: Q-Technology http://qtec.com/ + +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, see http://www.gnu.org/licenses/. +*/ please use this style of comment /* * . */ + +#include common.h +#include i2c.h +#include dtt.h + +#define ADT7460_ADDRESS 0x2c ^ +#define ADT7460_INVALID 128 ^ please remove whitespace +#define ADT7460_CONFIG 0x40 +#define ADT7460_REM1_TEMP0x25 +#define ADT7460_LOCAL_TEMP 0x26 +#define ADT7460_REM2_TEMP0x27 + + +int dtt_get_temp(int sensor) +{ + int aux; + u8 table[] = + { ADT7460_REM1_TEMP, ADT7460_LOCAL_TEMP, ADT7460_REM2_TEMP }; + + if (sensor 2) { + puts(DTT sensor does not exist\n); + return -1; + } + + aux = dtt_read(0, table[sensor]); + if (aux == -1) { + puts(DTT temperature read failed\n); + return -1; + Why no remove this empty line? + } + + return aux; +} diff --git a/include/dtt.h b/include/dtt.h index 34053d1..ce0fdfa 100644 --- a/include/dtt.h +++ b/include/dtt.h @@ -32,7 +32,8 @@ defined(CONFIG_DTT_DS1775) || \ defined(CONFIG_DTT_LM81) || \ defined(CONFIG_DTT_ADM1021) || \ -defined(CONFIG_DTT_LM73) +defined(CONFIG_DTT_LM73) || \ +defined(CONFIG_DTT_ADT7460) Best Regards, J. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] I2C Monitor Chip ADT7460 support (new version)
Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- -Add support to the ADT7460 Monitor Chip by Analog Devices. -Correct wrong previous coding style -Correct previous use of puts -Correct comments and remove whitespaces drivers/hwmon/Makefile |1 + drivers/hwmon/adt7460.c | 83 +++ include/dtt.h |3 +- 3 files changed, 86 insertions(+), 1 deletions(-) create mode 100644 drivers/hwmon/adt7460.c diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index f09f145..7342b91 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile @@ -37,6 +37,7 @@ COBJS-$(CONFIG_DTT_DS1775) += ds1775.o COBJS-$(CONFIG_DTT_LM73) += lm73.o COBJS-$(CONFIG_DTT_LM75) += lm75.o COBJS-$(CONFIG_DTT_LM81) += lm81.o +COBJS-$(CONFIG_DTT_ADT7460) += adt7460.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/hwmon/adt7460.c b/drivers/hwmon/adt7460.c new file mode 100644 index 000..68b593b --- /dev/null +++ b/drivers/hwmon/adt7460.c @@ -0,0 +1,83 @@ +/* + * (C) Copyright 2008 + * Ricado Ribalda-Universidad Autonoma de Madrid, [EMAIL PROTECTED] + * This work has been supported by: Q-Technology http://qtec.com/ + * 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, see http://www.gnu.org/licenses/. +*/ + +#include common.h +#include i2c.h +#include dtt.h + +#define ADT7460_ADDRESS0x2c +#define ADT7460_INVALID128 +#define ADT7460_CONFIG 0x40 +#define ADT7460_REM1_TEMP 0x25 +#define ADT7460_LOCAL_TEMP 0x26 +#define ADT7460_REM2_TEMP 0x27 + +int dtt_read(int sensor, int reg) +{ + u8 dir = reg; + u8 data; + + if (i2c_read(ADT7460_ADDRESS, dir, 1, data, 1) == -1) + return -1; + if (data == ADT7460_INVALID) + return -1; + + return data; +} + +int dtt_write(int sensor, int reg, int val) +{ + u8 dir = reg; + u8 data = val; + + if (i2c_write(ADT7460_ADDRESS, dir, 1, data, 1) == -1) + return -1; + + return 0; +} + +int dtt_init(void) +{ + printf(ADT7460 at I2C address 0x%2x\n, ADT7460_ADDRESS); + + if (dtt_write(0, ADT7460_CONFIG, 1) == -1) { + puts(Error initialiting ADT7460\n); + return -1; + } + + return 0; +} + +int dtt_get_temp(int sensor) +{ + int aux; + u8 table[] = + { ADT7460_REM1_TEMP, ADT7460_LOCAL_TEMP, ADT7460_REM2_TEMP }; + + if (sensor 2) { + puts(DTT sensor does not exist\n); + return -1; + } + + aux = dtt_read(0, table[sensor]); + if (aux == -1) { + puts(DTT temperature read failed\n); + return -1; + } + + return aux; +} diff --git a/include/dtt.h b/include/dtt.h index 34053d1..ce0fdfa 100644 --- a/include/dtt.h +++ b/include/dtt.h @@ -32,7 +32,8 @@ defined(CONFIG_DTT_DS1775) || \ defined(CONFIG_DTT_LM81) || \ defined(CONFIG_DTT_ADM1021) || \ -defined(CONFIG_DTT_LM73) +defined(CONFIG_DTT_LM73) || \ +defined(CONFIG_DTT_ADT7460) #define CONFIG_DTT /* We have a DTT */ -- 1.5.6.2 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 02/11] usb: Clean drivers/usb/Makefile
From: Michal Simek [EMAIL PROTECTED] Signed-off-by: Michal Simek [EMAIL PROTECTED] --- drivers/usb/Makefile| 12 ++-- drivers/usb/isp116x-hcd.c |3 --- drivers/usb/sl811_usb.c |3 --- drivers/usb/usb_ohci.c |3 --- drivers/usb/usbdcore_ep0.c |3 --- drivers/usb/usbdcore_mpc8xx.c |4 ++-- drivers/usb/usbdcore_omap1510.c |2 +- 7 files changed, 9 insertions(+), 21 deletions(-) diff --git a/drivers/usb/Makefile b/drivers/usb/Makefile index 252b00e..1388186 100644 --- a/drivers/usb/Makefile +++ b/drivers/usb/Makefile @@ -25,13 +25,13 @@ include $(TOPDIR)/config.mk LIB:= $(obj)libusb.a -COBJS-y += isp116x-hcd.o -COBJS-y += sl811_usb.o -COBJS-y += usb_ohci.o +COBJS-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o +COBJS-$(CONFIG_USB_SL811HS) += sl811_usb.o +COBJS-$(CONFIG_USB_OHCI_NEW) += usb_ohci.o COBJS-y += usbdcore.o -COBJS-y += usbdcore_ep0.o -COBJS-y += usbdcore_mpc8xx.o -COBJS-y += usbdcore_omap1510.o +COBJS-$(CONFIG_USB_DEVICE) += usbdcore_ep0.o +COBJS-$(CONFIG_MPC885_FAMILY) += usbdcore_mpc8xx.o +COBJS-$(CONFIG_OMAP1510) += usbdcore_omap1510.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/usb/isp116x-hcd.c b/drivers/usb/isp116x-hcd.c index 6b9b23b..e9e69bb 100644 --- a/drivers/usb/isp116x-hcd.c +++ b/drivers/usb/isp116x-hcd.c @@ -57,7 +57,6 @@ #include common.h -#ifdef CONFIG_USB_ISP116X_HCD #include asm/io.h #include usb.h #include malloc.h @@ -1441,5 +1440,3 @@ int usb_lowlevel_stop(void) return 0; } - -#endif /* CONFIG_USB_ISP116X_HCD */ diff --git a/drivers/usb/sl811_usb.c b/drivers/usb/sl811_usb.c index 159cc25..cfdd375 100644 --- a/drivers/usb/sl811_usb.c +++ b/drivers/usb/sl811_usb.c @@ -36,7 +36,6 @@ */ #include common.h -#ifdef CONFIG_USB_SL811HS #include mpc8xx.h #include usb.h #include sl811.h @@ -733,5 +732,3 @@ static int sl811_rh_submit_urb(struct usb_device *usb_dev, unsigned long pipe, return status == 0 ? len : status; } - -#endif /* CONFIG_USB_SL811HS */ diff --git a/drivers/usb/usb_ohci.c b/drivers/usb/usb_ohci.c index fd60edb..9e7b396 100644 --- a/drivers/usb/usb_ohci.c +++ b/drivers/usb/usb_ohci.c @@ -47,8 +47,6 @@ #include common.h -#ifdef CONFIG_USB_OHCI_NEW - #include asm/byteorder.h #if defined(CONFIG_PCI_OHCI) @@ -1910,4 +1908,3 @@ int usb_lowlevel_stop(void) return 0; } -#endif /* CONFIG_USB_OHCI_NEW */ diff --git a/drivers/usb/usbdcore_ep0.c b/drivers/usb/usbdcore_ep0.c index cf3f382..2395eec 100644 --- a/drivers/usb/usbdcore_ep0.c +++ b/drivers/usb/usbdcore_ep0.c @@ -52,7 +52,6 @@ #include common.h -#if defined(CONFIG_USB_DEVICE) #include usbdcore.h #if 0 @@ -597,5 +596,3 @@ int ep0_recv_setup (struct urb *urb) } return -1; } - -#endif diff --git a/drivers/usb/usbdcore_mpc8xx.c b/drivers/usb/usbdcore_mpc8xx.c index 122793c..539e0f8 100644 --- a/drivers/usb/usbdcore_mpc8xx.c +++ b/drivers/usb/usbdcore_mpc8xx.c @@ -59,7 +59,7 @@ #include common.h #include config.h -#if defined(CONFIG_MPC885_FAMILY) defined(CONFIG_USB_DEVICE) +#if defined(CONFIG_USB_DEVICE) #include commproc.h #include usbdcore.h #include usbdcore_mpc8xx.h @@ -1399,4 +1399,4 @@ static u32 mpc8xx_udc_alloc (u32 data_size, u32 alignment) return retaddr; } -#endif /* CONFIG_MPC885_FAMILY CONFIG_USB_DEVICE) */ +#endif /* CONFIG_USB_DEVICE) */ diff --git a/drivers/usb/usbdcore_omap1510.c b/drivers/usb/usbdcore_omap1510.c index 84bb936..8d23537 100644 --- a/drivers/usb/usbdcore_omap1510.c +++ b/drivers/usb/usbdcore_omap1510.c @@ -28,7 +28,7 @@ #include common.h -#if defined(CONFIG_OMAP1510) defined(CONFIG_USB_DEVICE) +#if defined(CONFIG_USB_DEVICE) #include asm/io.h #ifdef CONFIG_OMAP_SX1 -- 1.5.4.GIT - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 01/11] i2c: Clean drivers/i2c/ Makefile
From: Michal Simek [EMAIL PROTECTED] Signed-off-by: Michal Simek [EMAIL PROTECTED] --- drivers/i2c/Makefile | 10 +- drivers/i2c/fsl_i2c.c |2 -- drivers/i2c/mxc_i2c.c |2 +- drivers/i2c/omap1510_i2c.c |4 drivers/i2c/omap24xx_i2c.c |4 drivers/i2c/tsi108_i2c.c |2 -- 6 files changed, 6 insertions(+), 18 deletions(-) diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index 534c015..1f25afb 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -25,11 +25,11 @@ include $(TOPDIR)/config.mk LIB:= $(obj)libi2c.a -COBJS-y += fsl_i2c.o -COBJS-y += omap1510_i2c.o -COBJS-y += omap24xx_i2c.o -COBJS-y += tsi108_i2c.o -COBJS-y += mxc_i2c.o +COBJS-$(CONFIG_FSL_I2C) += fsl_i2c.o +COBJS-$(CONFIG_I2C_MXC) += mxc_i2c.o +COBJS-$(CONFIG_DRIVER_OMAP1510_I2C) += omap1510_i2c.o +COBJS-$(CONFIG_DRIVER_OMAP24XX_I2C) += omap24xx_i2c.o +COBJS-$(CONFIG_TSI108_I2C) += tsi108_i2c.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/i2c/fsl_i2c.c b/drivers/i2c/fsl_i2c.c index 9f2c1ec..688f66a 100644 --- a/drivers/i2c/fsl_i2c.c +++ b/drivers/i2c/fsl_i2c.c @@ -18,7 +18,6 @@ #include common.h -#ifdef CONFIG_FSL_I2C #ifdef CONFIG_HARD_I2C #include command.h @@ -387,4 +386,3 @@ unsigned int i2c_get_bus_speed(void) } #endif /* CONFIG_HARD_I2C */ -#endif /* CONFIG_FSL_I2C */ diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index a218329..1f6ba1f 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -24,7 +24,7 @@ #include common.h -#if defined(CONFIG_HARD_I2C) defined (CONFIG_I2C_MXC) +#if defined(CONFIG_HARD_I2C) #include asm/arch/mx31.h #include asm/arch/mx31-regs.h diff --git a/drivers/i2c/omap1510_i2c.c b/drivers/i2c/omap1510_i2c.c index 04400fb..388951d 100644 --- a/drivers/i2c/omap1510_i2c.c +++ b/drivers/i2c/omap1510_i2c.c @@ -20,8 +20,6 @@ #include common.h -#ifdef CONFIG_DRIVER_OMAP1510_I2C - static void wait_for_bb (void); static u16 wait_for_pin (void); @@ -277,5 +275,3 @@ static u16 wait_for_pin (void) return status; } - -#endif /* CONFIG_DRIVER_OMAP1510_I2C */ diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c index 7dab786..d16cfb1 100644 --- a/drivers/i2c/omap24xx_i2c.c +++ b/drivers/i2c/omap24xx_i2c.c @@ -22,8 +22,6 @@ #include common.h -#ifdef CONFIG_DRIVER_OMAP24XX_I2C - #include asm/arch/i2c.h #include asm/io.h @@ -325,5 +323,3 @@ static u16 wait_for_pin (void) } return status; } - -#endif /* CONFIG_DRIVER_OMAP24XX_I2C */ diff --git a/drivers/i2c/tsi108_i2c.c b/drivers/i2c/tsi108_i2c.c index d6736b0..695e393 100644 --- a/drivers/i2c/tsi108_i2c.c +++ b/drivers/i2c/tsi108_i2c.c @@ -25,7 +25,6 @@ #include config.h #include common.h -#ifdef CONFIG_TSI108_I2C #include tsi108.h #if defined(CONFIG_CMD_I2C) @@ -280,4 +279,3 @@ int i2c_probe (uchar chip) } #endif -#endif /* CONFIG_TSI108_I2C */ -- 1.5.4.GIT - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 04/11] serial: Clean drivers/serial/Makefile
From: Michal Simek [EMAIL PROTECTED] Signed-off-by: Michal Simek [EMAIL PROTECTED] --- drivers/serial/Makefile | 24 drivers/serial/atmel_usart.c |3 --- drivers/serial/mcfuart.c |3 --- drivers/serial/ns16550.c |4 drivers/serial/ns9750_serial.c|4 drivers/serial/s3c4510b_uart.c|4 drivers/serial/serial.c |4 drivers/serial/serial_max3100.c |4 drivers/serial/serial_pl010.c |4 drivers/serial/serial_pl011.c |4 drivers/serial/serial_sh.c|4 drivers/serial/serial_xuartlite.c |4 drivers/serial/usbtty.c |5 - 13 files changed, 12 insertions(+), 59 deletions(-) diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index c9e797e..45dfe96 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -25,18 +25,18 @@ include $(TOPDIR)/config.mk LIB:= $(obj)libserial.a -COBJS-y += atmel_usart.o -COBJS-y += mcfuart.o -COBJS-y += ns9750_serial.o -COBJS-y += ns16550.o -COBJS-y += s3c4510b_uart.o -COBJS-y += serial.o -COBJS-y += serial_max3100.o -COBJS-y += serial_pl010.o -COBJS-y += serial_pl011.o -COBJS-y += serial_xuartlite.o -COBJS-y += serial_sh.o -COBJS-y += usbtty.o +COBJS-$(CONFIG_ATMEL_USART) += atmel_usart.o +COBJS-$(CONFIG_MCFUART) += mcfuart.o +COBJS-$(CFG_NS9750_UART) += ns9750_serial.o +COBJS-$(CFG_NS16550) += ns16550.o +COBJS-$(CONFIG_DRIVER_S3C4510_UART) += s3c4510b_uart.o +COBJS-$(CFG_NS16550_SERIAL) += serial.o +COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o +COBJS-$(CFG_PL010_SERIAL) += serial_pl010.o +COBJS-$(CFG_PL011_SERIAL) += serial_pl011.o +COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o +COBJS-$(CFG_SCIF_CONSOLE) += serial_sh.o +COBJS-$(CONFIG_USB_TTY) += usbtty.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index f35b997..f3b146c 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -17,7 +17,6 @@ */ #include common.h -#ifdef CONFIG_ATMEL_USART #include asm/io.h #include asm/arch/clk.h #include asm/arch/memory-map.h @@ -96,5 +95,3 @@ int serial_tstc(void) { return (usart3_readl(CSR) USART3_BIT(RXRDY)) != 0; } - -#endif /* CONFIG_ATMEL_USART */ diff --git a/drivers/serial/mcfuart.c b/drivers/serial/mcfuart.c index 5eb4f45..a1fcd05 100644 --- a/drivers/serial/mcfuart.c +++ b/drivers/serial/mcfuart.c @@ -29,8 +29,6 @@ #include common.h -#ifdef CONFIG_MCFUART - #include asm/immap.h #include asm/uart.h @@ -130,4 +128,3 @@ void serial_setbrg(void) uart-ucr = UART_UCR_RX_ENABLED | UART_UCR_TX_ENABLED; } -#endif /* CONFIG_MCFUART */ diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 6b3f60e..af717e0 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -6,8 +6,6 @@ #include config.h -#ifdef CFG_NS16550 - #include ns16550.h #define LCRVAL LCR_8N1 /* 8 data, 1 stop, no parity */ @@ -75,5 +73,3 @@ int NS16550_tstc (NS16550_t com_port) { return ((com_port-lsr LSR_DR) != 0); } - -#endif diff --git a/drivers/serial/ns9750_serial.c b/drivers/serial/ns9750_serial.c index 02c0d39..e9645a0 100644 --- a/drivers/serial/ns9750_serial.c +++ b/drivers/serial/ns9750_serial.c @@ -28,8 +28,6 @@ #include common.h -#ifdef CFG_NS9750_UART - #include ns9750_bbus.h /* for GPIOs */ #include ns9750_ser.h/* for serial configuration */ @@ -210,5 +208,3 @@ static unsigned int calcRxCharGapRegister( void ) { return NS9750_SER_RX_CHAR_TIMER_TRUN; } - -#endif /* CFG_NS9750_UART */ diff --git a/drivers/serial/s3c4510b_uart.c b/drivers/serial/s3c4510b_uart.c index ddcd591..aa378e1 100644 --- a/drivers/serial/s3c4510b_uart.c +++ b/drivers/serial/s3c4510b_uart.c @@ -45,8 +45,6 @@ #include common.h -#ifdef CONFIG_DRIVER_S3C4510_UART - #include asm/hardware.h #include s3c4510b_uart.h @@ -212,5 +210,3 @@ void serial_puts (const char *s) uart-m_ctrl.bf.sendBreak = 0; } - -#endif diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 4ccaee2..77a0ba5 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -23,8 +23,6 @@ #include common.h -#ifdef CFG_NS16550_SERIAL - #include ns16550.h #ifdef CFG_NS87308 #include ns87308.h @@ -334,5 +332,3 @@ DECLARE_ESERIAL_FUNCTIONS(4); struct serial_device eserial4_device = INIT_ESERIAL_STRUCTURE(4,eserial3,EUART4); #endif /* CONFIG_SERIAL_MULTI */ - -#endif diff --git a/drivers/serial/serial_max3100.c b/drivers/serial/serial_max3100.c index 0611fc1..4abc271 100644 --- a/drivers/serial/serial_max3100.c +++ b/drivers/serial/serial_max3100.c @@ -26,8 +26,6 @@ #include common.h #include watchdog.h -#ifdef CONFIG_MAX3100_SERIAL - DECLARE_GLOBAL_DATA_PTR;
[U-Boot-Users] [PATCH 03/11] rtc: Clean drivers/rtc/Makefile
From: Michal Simek [EMAIL PROTECTED] Signed-off-by: Michal Simek [EMAIL PROTECTED] --- drivers/rtc/Makefile | 50 ++-- drivers/rtc/bfin_rtc.c|2 +- drivers/rtc/ds12887.c |2 +- drivers/rtc/ds1302.c |2 +- drivers/rtc/ds1306.c |2 +- drivers/rtc/ds1307.c |3 +- drivers/rtc/ds1337.c |2 +- drivers/rtc/ds1374.c |2 +- drivers/rtc/ds1556.c |3 +- drivers/rtc/ds164x.c |2 +- drivers/rtc/ds174x.c |2 +- drivers/rtc/ds3231.c |2 +- drivers/rtc/m41t11.c |2 +- drivers/rtc/m41t60.c |3 +- drivers/rtc/m48t35ax.c|2 +- drivers/rtc/max6900.c |2 +- drivers/rtc/mc146818.c|2 +- drivers/rtc/mcfrtc.c |2 +- drivers/rtc/mk48t59.c |3 -- drivers/rtc/mpc5xxx.c |2 +- drivers/rtc/mpc8xx.c |2 +- drivers/rtc/pcf8563.c |2 +- drivers/rtc/rs5c372.c |2 +- drivers/rtc/rx8025.c |2 +- drivers/rtc/s3c24x0_rtc.c |2 +- drivers/rtc/x1205.c |2 +- 26 files changed, 49 insertions(+), 55 deletions(-) diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 2e0c118..2af3ee5 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -27,35 +27,35 @@ include $(TOPDIR)/config.mk LIB= $(obj)librtc.a -COBJS-y += bfin_rtc.o +COBJS-$(CONFIG_RTC_BFIN) += bfin_rtc.o COBJS-y += date.o -COBJS-y += ds12887.o -COBJS-y += ds1302.o -COBJS-y += ds1306.o -COBJS-y += ds1307.o -COBJS-y += ds1337.o -COBJS-y += ds1374.o -COBJS-y += ds1556.o -COBJS-y += ds164x.o -COBJS-y += ds174x.o -COBJS-y += ds3231.o +COBJS-$(CONFIG_RTC_DS12887) += ds12887.o +COBJS-$(CONFIG_RTC_DS1302) += ds1302.o +COBJS-$(CONFIG_RTC_DS1306) += ds1306.o +COBJS-$(CONFIG_RTC_DS1307 || CONFIG_RTC_DS1338) += ds1307.o +COBJS-$(CONFIG_RTC_DS1337) += ds1337.o +COBJS-$(CONFIG_RTC_DS1374) += ds1374.o +COBJS-$(CONFIG_RTC_DS1556) += ds1556.o +COBJS-$(CONFIG_RTC_DS164x) += ds164x.o +COBJS-$(CONFIG_RTC_DS174x) += ds174x.o +COBJS-$(CONFIG_RTC_DS3231) += ds3231.o COBJS-$(CONFIG_RTC_ISL1208) += isl1208.o -COBJS-y += m41t11.o -COBJS-y += m41t60.o +COBJS-$(CONFIG_RTC_M41T11) += m41t11.o +COBJS-$(CONFIG_RTC_M41T60) += m41t60.o COBJS-$(CONFIG_RTC_M41T62) += m41t62.o -COBJS-y += m48t35ax.o -COBJS-y += max6900.o +COBJS-$(CONFIG_RTC_M48T35A) += m48t35ax.o +COBJS-$(CONFIG_RTC_MAX6900) += max6900.o COBJS-$(CONFIG_RTC_MC13783) += mc13783-rtc.o -COBJS-y += mc146818.o -COBJS-y += mcfrtc.o -COBJS-y += mk48t59.o -COBJS-y += mpc5xxx.o -COBJS-y += mpc8xx.o -COBJS-y += pcf8563.o -COBJS-y += rs5c372.o -COBJS-y += rx8025.o -COBJS-y += s3c24x0_rtc.o -COBJS-y += x1205.o +COBJS-$(CONFIG_RTC_MC146818) += mc146818.o +COBJS-$(CONFIG_MCFRTC) += mcfrtc.o +COBJS-$(CONFIG_RTC_MK48T59) += mk48t59.o +COBJS-$(CONFIG_RTC_MPC5200) += mpc5xxx.o +COBJS-$(CONFIG_RTC_MPC8xx) += mpc8xx.o +COBJS-$(CONFIG_RTC_PCF8563) += pcf8563.o +COBJS-$(CONFIG_RTC_RS5C372A) += rs5c372.o +COBJS-$(CONFIG_RTC_RX8025) += rx8025.o +COBJS-$(CONFIG_RTC_S3C24X0) += s3c24x0_rtc.o +COBJS-$(CONFIG_RTC_X1205) += x1205.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/rtc/bfin_rtc.c b/drivers/rtc/bfin_rtc.c index ce4f171..ee8acd3 100644 --- a/drivers/rtc/bfin_rtc.c +++ b/drivers/rtc/bfin_rtc.c @@ -11,7 +11,7 @@ #include command.h #include rtc.h -#if defined(CONFIG_RTC_BFIN) defined(CONFIG_CMD_DATE) +#if defined(CONFIG_CMD_DATE) #include asm/blackfin.h #include asm/mach-common/bits/rtc.h diff --git a/drivers/rtc/ds12887.c b/drivers/rtc/ds12887.c index 990ebba..fb1825b 100644 --- a/drivers/rtc/ds12887.c +++ b/drivers/rtc/ds12887.c @@ -28,7 +28,7 @@ #include config.h #include rtc.h -#if defined(CONFIG_RTC_DS12887) defined(CONFIG_CMD_DATE) +#if defined(CONFIG_CMD_DATE) #define RTC_SECONDS0x00 #define RTC_SECONDS_ALARM 0x01 diff --git a/drivers/rtc/ds1302.c b/drivers/rtc/ds1302.c index e4e9154..d28a9fd 100644 --- a/drivers/rtc/ds1302.c +++ b/drivers/rtc/ds1302.c @@ -9,7 +9,7 @@ #include command.h #include rtc.h -#if defined(CONFIG_RTC_DS1302) defined(CONFIG_CMD_DATE) +#if defined(CONFIG_CMD_DATE) /* GPP Pins */ #define DATA 0x200 diff --git a/drivers/rtc/ds1306.c b/drivers/rtc/ds1306.c index 29854fc..12528ed 100644 --- a/drivers/rtc/ds1306.c +++ b/drivers/rtc/ds1306.c @@ -36,7 +36,7 @@ #include rtc.h #include spi.h -#if defined(CONFIG_RTC_DS1306) defined(CONFIG_CMD_DATE) +#if defined(CONFIG_CMD_DATE) #defineRTC_SECONDS 0x00 #defineRTC_MINUTES 0x01 diff --git a/drivers/rtc/ds1307.c b/drivers/rtc/ds1307.c index b20f193..11fc14f 100644 --- a/drivers/rtc/ds1307.c +++ b/drivers/rtc/ds1307.c @@ -35,8 +35,7 @@ #include rtc.h #include i2c.h -#if (defined(CONFIG_RTC_DS1307) || defined(CONFIG_RTC_DS1338) ) \ -defined(CONFIG_CMD_DATE) +#if defined(CONFIG_CMD_DATE) /*-*/ #undef
[U-Boot-Users] [PATCH 05/11] mtd: Clean drivers/mtd/Makefile
From: Michal Simek [EMAIL PROTECTED] Signed-off-by: Michal Simek [EMAIL PROTECTED] --- drivers/mtd/Makefile|6 +++--- drivers/mtd/at45.c |2 -- drivers/mtd/cfi_flash.c |3 --- drivers/mtd/mw_eeprom.c |5 - 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index ff932a1..e1bf095 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -25,10 +25,10 @@ include $(TOPDIR)/config.mk LIB:= $(obj)libmtd.a -COBJS-y += at45.o -COBJS-y += cfi_flash.o +COBJS-$(CONFIG_HAS_DATAFLASH) += at45.o +COBJS-$(CFG_FLASH_CFI_DRIVER) += cfi_flash.o COBJS-$(CONFIG_HAS_DATAFLASH) += dataflash.o -COBJS-y += mw_eeprom.o +COBJS-$(CONFIG_MW_EEPROM) += mw_eeprom.o COBJS-$(CONFIG_FLASH_CFI_LEGACY) += jedec_flash.o COBJS := $(COBJS-y) diff --git a/drivers/mtd/at45.c b/drivers/mtd/at45.c index a9d13ff..4739e04 100644 --- a/drivers/mtd/at45.c +++ b/drivers/mtd/at45.c @@ -21,7 +21,6 @@ #include config.h #include common.h -#ifdef CONFIG_HAS_DATAFLASH #include dataflash.h /* @@ -559,4 +558,3 @@ int AT91F_DataflashProbe(int cs, AT91PS_DataflashDesc pDesc) AT91F_DataFlashGetStatus(pDesc); return ((pDesc-command[1] == 0xFF) ? 0 : pDesc-command[1] 0x3C); } -#endif diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index c0ea97b..5bed30d 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -39,7 +39,6 @@ #include asm/io.h #include asm/byteorder.h #include environment.h -#ifdef CFG_FLASH_CFI_DRIVER /* * This file implements a Common Flash Interface (CFI) driver for @@ -2010,5 +2009,3 @@ unsigned long flash_init (void) #endif return (size); } - -#endif /* CFG_FLASH_CFI */ diff --git a/drivers/mtd/mw_eeprom.c b/drivers/mtd/mw_eeprom.c index 2b33488..f32ced4 100644 --- a/drivers/mtd/mw_eeprom.c +++ b/drivers/mtd/mw_eeprom.c @@ -1,9 +1,6 @@ /* Three-wire (MicroWire) serial eeprom driver (for 93C46 and compatibles) */ #include common.h - -#ifdef CONFIG_MW_EEPROM - #include ssi.h /* @@ -237,5 +234,3 @@ int mw_eeprom_probe(int dev) } return 0; } - -#endif -- 1.5.4.GIT - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 08/11] dma: Clean drivers/dma/Makefile
From: Michal Simek [EMAIL PROTECTED] Signed-off-by: Michal Simek [EMAIL PROTECTED] --- drivers/dma/MCD_dmaApi.c|3 --- drivers/dma/MCD_tasks.c |4 drivers/dma/MCD_tasksInit.c |4 drivers/dma/Makefile|2 +- 4 files changed, 1 insertions(+), 12 deletions(-) diff --git a/drivers/dma/MCD_dmaApi.c b/drivers/dma/MCD_dmaApi.c index b0062b7..5c95651 100644 --- a/drivers/dma/MCD_dmaApi.c +++ b/drivers/dma/MCD_dmaApi.c @@ -24,8 +24,6 @@ #include common.h -#ifdef CONFIG_FSLDMAFEC - #include MCD_dma.h #include MCD_tasksInit.h #include MCD_progCheck.h @@ -1023,4 +1021,3 @@ static void MCD_memcpy(int *dest, int *src, u32 size) for (i = 0; i size; i += sizeof(int), dest++, src++) *dest = *src; } -#endif /* CONFIG_FSLDMAFEC */ diff --git a/drivers/dma/MCD_tasks.c b/drivers/dma/MCD_tasks.c index 06a2d53..4f6e346 100644 --- a/drivers/dma/MCD_tasks.c +++ b/drivers/dma/MCD_tasks.c @@ -24,8 +24,6 @@ #include common.h -#ifdef CONFIG_FSLDMAFEC - #include MCD_dma.h u32 MCD_varTab0[]; @@ -2430,5 +2428,3 @@ u32 MCD_ENetXmit_TDT[] = { #ifdef MCD_INCLUDE_EU MCD_bufDesc MCD_singleBufDescs[NCHANNELS]; #endif - -#endif /* CONFIG_FSLDMAFEC */ diff --git a/drivers/dma/MCD_tasksInit.c b/drivers/dma/MCD_tasksInit.c index cf567db..2f19875 100644 --- a/drivers/dma/MCD_tasksInit.c +++ b/drivers/dma/MCD_tasksInit.c @@ -28,8 +28,6 @@ * Do not edit! */ -#ifdef CONFIG_FSLDMAFEC - #include MCD_dma.h extern dmaRegs *MCD_dmaBar; @@ -242,5 +240,3 @@ void MCD_startDmaENetXmit(char *bDBase, char *currBD, char *xmitFifoPtr, /* Set the task's Enable bit in its Task Control Register */ MCD_dmaBar-taskControl[channel] |= (u16) 0x8000; } - -#endif /* CONFIG_FSLDMAFEC */ diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index 7e17360..cf29efa 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB:= $(obj)libdma.a -COBJS-y += MCD_tasksInit.o MCD_dmaApi.o MCD_tasks.o +COBJS-$(CONFIG_FSLDMAFEC) += MCD_tasksInit.o MCD_dmaApi.o MCD_tasks.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) -- 1.5.4.GIT - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 10/11] input: Clean drivers/input/Makefile
From: Michal Simek [EMAIL PROTECTED] Signed-off-by: Michal Simek [EMAIL PROTECTED] --- drivers/input/Makefile |7 --- drivers/input/i8042.c|4 drivers/input/keyboard.c |4 drivers/input/pc_keyb.c |4 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/input/Makefile b/drivers/input/Makefile index 2933cb6..d34c5e7 100644 --- a/drivers/input/Makefile +++ b/drivers/input/Makefile @@ -25,9 +25,10 @@ include $(TOPDIR)/config.mk LIB:= $(obj)libinput.a -COBJS-y += i8042.o -COBJS-y += keyboard.o -COBJS-y += pc_keyb.o ps2ser.o ps2mult.o +COBJS-$(CONFIG_I8042_KBD) += i8042.o +COBJS-$(CONFIG_PS2KBD) += keyboard.o pc_keyb.o +COBJS-$(CONFIG_PS2SERIAL) += ps2ser.o +COBJS-$(CONFIG_PS2MULT) += ps2mult.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c index 22c2a4e..d152768 100644 --- a/drivers/input/i8042.c +++ b/drivers/input/i8042.c @@ -27,8 +27,6 @@ #include common.h -#ifdef CONFIG_I8042_KBD - #ifdef CONFIG_USE_CPCIDVI extern u8 gt_cpcidvi_in8(u32 offset); extern void gt_cpcidvi_out8(u32 offset, u8 data); @@ -670,5 +668,3 @@ static int kbd_reset (void) return 0; } - -#endif /* CONFIG_I8042_KBD */ diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c index 54182a7..a634d76 100644 --- a/drivers/input/keyboard.c +++ b/drivers/input/keyboard.c @@ -11,8 +11,6 @@ #include common.h -#ifdef CONFIG_PS2KBD - #include devices.h #include keyboard.h @@ -301,5 +299,3 @@ int kbd_init (void) } return error; } - -#endif /* CONFIG_PS2KBD */ diff --git a/drivers/input/pc_keyb.c b/drivers/input/pc_keyb.c index 81d3e98..4649580 100644 --- a/drivers/input/pc_keyb.c +++ b/drivers/input/pc_keyb.c @@ -13,8 +13,6 @@ #include common.h -#ifdef CONFIG_PS2KBD - #include keyboard.h #include pc_keyb.h @@ -252,5 +250,3 @@ void pckbd_leds(unsigned char leds) kbd_send_data(KBD_CMD_SET_LEDS); kbd_send_data(leds); } - -#endif /* CONFIG_PS2KBD */ -- 1.5.4.GIT - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 09/11] pci: Clean drivers/pci/Makefile
From: Michal Simek [EMAIL PROTECTED] Signed-off-by: Michal Simek [EMAIL PROTECTED] --- drivers/pci/Makefile | 10 -- drivers/pci/fsl_pci_init.c |4 drivers/pci/pci.c |4 drivers/pci/pci_auto.c |5 - drivers/pci/pci_indirect.c |2 -- drivers/pci/tsi108_pci.c |4 drivers/pci/w83c553f.c |4 7 files changed, 4 insertions(+), 29 deletions(-) diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index dec93b9..87a3a96 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -25,12 +25,10 @@ include $(TOPDIR)/config.mk LIB:= $(obj)libpci.a -COBJS-y += fsl_pci_init.o -COBJS-y += pci.o -COBJS-y += pci_auto.o -COBJS-y += pci_indirect.o -COBJS-y += tsi108_pci.o -COBJS-y += w83c553f.o +COBJS-$(CONFIG_FSL_PCI_INIT) += fsl_pci_init.o +COBJS-$(CONFIG_PCI) += pci.o pci_auto.o pci_indirect.o +COBJS-$(CONFIG_TSI108_PCI) += tsi108_pci.o +COBJS-$(CFG_WINBOND_83C553) += w83c553f.o COBJS-$(CONFIG_SH4_PCI) += pci_sh4.o COBJS-$(CONFIG_SH7751_PCI) +=pci_sh7751.o COBJS-$(CONFIG_SH7780_PCI) +=pci_sh7780.o diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index 7dc33be..2fdb8d0 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -18,8 +18,6 @@ #include common.h -#ifdef CONFIG_FSL_PCI_INIT - /* * PCI/PCIE Controller initialization for mpc85xx/mpc86xx soc's * @@ -197,5 +195,3 @@ fsl_pci_init(struct pci_controller *hose) pci_hose_write_config_word(hose, dev, PCI_SEC_STATUS, 0x); } } - -#endif /* CONFIG_FSL_PCI */ diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 16180cb..b5eea89 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -30,8 +30,6 @@ #include common.h -#ifdef CONFIG_PCI - #include command.h #include asm/processor.h #include asm/io.h @@ -544,5 +542,3 @@ void pci_init(void) /* now call board specific pci_init()... */ pci_init_board(); } - -#endif /* CONFIG_PCI */ diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c index eb69593..944ebc7 100644 --- a/drivers/pci/pci_auto.c +++ b/drivers/pci/pci_auto.c @@ -14,9 +14,6 @@ */ #include common.h - -#ifdef CONFIG_PCI - #include pci.h #undef DEBUG @@ -408,5 +405,3 @@ int pciauto_config_device(struct pci_controller *hose, pci_dev_t dev) return sub_bus; } - -#endif /* CONFIG_PCI */ diff --git a/drivers/pci/pci_indirect.c b/drivers/pci/pci_indirect.c index 55517a8..ab51f8d 100644 --- a/drivers/pci/pci_indirect.c +++ b/drivers/pci/pci_indirect.c @@ -11,7 +11,6 @@ #include common.h -#ifdef CONFIG_PCI #if (!defined(__I386__) !defined(CONFIG_IXDP425)) #include asm/processor.h @@ -135,4 +134,3 @@ void pci_setup_indirect(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data) } #endif /* !__I386__ !CONFIG_IXDP425 */ -#endif /* CONFIG_PCI */ diff --git a/drivers/pci/tsi108_pci.c b/drivers/pci/tsi108_pci.c index 4f02cb8..edd614f 100644 --- a/drivers/pci/tsi108_pci.c +++ b/drivers/pci/tsi108_pci.c @@ -27,8 +27,6 @@ #include config.h -#ifdef CONFIG_TSI108_PCI - #include common.h #include pci.h #include asm/io.h @@ -182,5 +180,3 @@ void ft_pci_setup(void *blob, bd_t *bd) } } #endif /* CONFIG_OF_LIBFDT */ - -#endif /* CONFIG_TSI108_PCI */ diff --git a/drivers/pci/w83c553f.c b/drivers/pci/w83c553f.c index 9ea08a2..d7355a4 100644 --- a/drivers/pci/w83c553f.c +++ b/drivers/pci/w83c553f.c @@ -30,8 +30,6 @@ #include common.h #include config.h -#ifdef CFG_WINBOND_83C553 - #include asm/io.h #include pci.h @@ -222,5 +220,3 @@ void initialise_dma(void) out8(W83C553F_DMA1 + W83C553F_DMA1_CS, 0x00); out16(W83C553F_DMA2 + W83C553F_DMA2_CS, 0x); } - -#endif /* CFG_WINBOND_83C553 */ -- 1.5.4.GIT - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 07/11] block: Clean drivers/block/Makefile
From: Michal Simek [EMAIL PROTECTED] Signed-off-by: Michal Simek [EMAIL PROTECTED] --- drivers/block/Makefile| 10 +- drivers/block/ahci.c |3 --- drivers/block/ata_piix.c |4 drivers/block/sil680.c|4 +--- drivers/block/sym53c8xx.c |5 - drivers/block/systemace.c |3 --- 6 files changed, 6 insertions(+), 23 deletions(-) diff --git a/drivers/block/Makefile b/drivers/block/Makefile index a09cd2a..95db69c 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -25,14 +25,14 @@ include $(TOPDIR)/config.mk LIB:= $(obj)libblock.a -COBJS-y += ahci.o -COBJS-y += ata_piix.o +COBJS-$(CONFIG_SCSI_AHCI) += ahci.o +COBJS-$(CFG_ATA_PIIX) += ata_piix.o COBJS-$(CONFIG_FSL_SATA) += fsl_sata.o COBJS-$(CONFIG_LIBATA) += libata.o COBJS-$(CONFIG_SATA_SIL3114) += sata_sil3114.o -COBJS-y += sil680.o -COBJS-y += sym53c8xx.o -COBJS-y += systemace.o +COBJS-$(CFG_IDE_SIL680) += sil680.o +COBJS-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o +COBJS-$(CONFIG_SYSTEMACE) += systemace.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c index 3d82c62..52fd108 100644 --- a/drivers/block/ahci.c +++ b/drivers/block/ahci.c @@ -26,8 +26,6 @@ */ #include common.h -#ifdef CONFIG_SCSI_AHCI - #include command.h #include pci.h #include asm/processor.h @@ -700,4 +698,3 @@ void scsi_print_error(ccb * pccb) { /*The ahci error info can be read in the ahci driver*/ } -#endif diff --git a/drivers/block/ata_piix.c b/drivers/block/ata_piix.c index 441a4dc..4c26b36 100644 --- a/drivers/block/ata_piix.c +++ b/drivers/block/ata_piix.c @@ -35,8 +35,6 @@ #include ide.h #include ata.h -#ifdef CFG_ATA_PIIX/*ata_piix driver */ - extern block_dev_desc_t sata_dev_desc[CFG_SATA_MAX_DEVICE]; extern int curr_device; @@ -756,5 +754,3 @@ int scan_sata(int dev) { return 0; } - -#endif diff --git a/drivers/block/sil680.c b/drivers/block/sil680.c index a6143df..3535f20 100644 --- a/drivers/block/sil680.c +++ b/drivers/block/sil680.c @@ -54,7 +54,7 @@ */ #include common.h -#if defined(CFG_IDE_SIL680) + #include ata.h #include ide.h #include pci.h @@ -106,5 +106,3 @@ int ide_preinit (void) void ide_set_reset (int flag) { return; } - -#endif /* CFG_IDE_SIL680 */ diff --git a/drivers/block/sym53c8xx.c b/drivers/block/sym53c8xx.c index 87b63b7..9291b60 100644 --- a/drivers/block/sym53c8xx.c +++ b/drivers/block/sym53c8xx.c @@ -35,8 +35,6 @@ #include common.h -#ifdef CONFIG_SCSI_SYM53C8XX - #include command.h #include pci.h #include asm/processor.h @@ -870,6 +868,3 @@ void scsi_chip_init(void) #endif } #endif - - -#endif /* CONFIG_SCSI_SYM53C8XX */ diff --git a/drivers/block/systemace.c b/drivers/block/systemace.c index 7d82c27..dfaab52 100644 --- a/drivers/block/systemace.c +++ b/drivers/block/systemace.c @@ -44,8 +44,6 @@ #include part.h #include asm/io.h -#ifdef CONFIG_SYSTEMACE - /* * The ace_readw and writew functions read/write 16bit words, but the * offset value is the BYTE offset as most used in the Xilinx @@ -255,4 +253,3 @@ static unsigned long systemace_read(int dev, unsigned long start, return blkcnt; } -#endif /* CONFIG_SYSTEMACE */ -- 1.5.4.GIT - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 11/11] video: Clean drivers/video/Makefile
From: Michal Simek [EMAIL PROTECTED] Signed-off-by: Michal Simek [EMAIL PROTECTED] --- drivers/video/Makefile| 16 drivers/video/ati_radeon_fb.c |3 --- drivers/video/cfb_console.c |3 --- drivers/video/ct69000.c |5 - drivers/video/mb862xx.c |3 --- drivers/video/sed13806.c |3 --- drivers/video/sed156x.c |4 drivers/video/sm501.c |4 drivers/video/smiLynxEM.c |4 9 files changed, 8 insertions(+), 37 deletions(-) diff --git a/drivers/video/Makefile b/drivers/video/Makefile index 20a54c5..7fba29f 100644 --- a/drivers/video/Makefile +++ b/drivers/video/Makefile @@ -25,15 +25,15 @@ include $(TOPDIR)/config.mk LIB:= $(obj)libvideo.a -COBJS-y += ati_radeon_fb.o +COBJS-$(CONFIG_ATI_RADEON_FB) += ati_radeon_fb.o COBJS-$(CONFIG_ATMEL_LCD) += atmel_lcdfb.o -COBJS-y += cfb_console.o -COBJS-y += ct69000.o -COBJS-y += mb862xx.o -COBJS-y += sed13806.o -COBJS-y += sed156x.o -COBJS-y += sm501.o -COBJS-y += smiLynxEM.o +COBJS-$(CONFIG_CFB_CONSOLE) += cfb_console.o +COBJS-$(CONFIG_VIDEO_CT69000) += ct69000.o +COBJS-$(CONFIG_VIDEO_MB862xx) += mb862xx.o +COBJS-$(CONFIG_VIDEO_SED13806) += sed13806.o +COBJS-$(CONFIG_SED156X) += sed156x.o +COBJS-$(CONFIG_VIDEO_SM501) += sm501.o +COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o COBJS-y += videomodes.o COBJS := $(COBJS-y) diff --git a/drivers/video/ati_radeon_fb.c b/drivers/video/ati_radeon_fb.c index a1e7bae..650380b 100644 --- a/drivers/video/ati_radeon_fb.c +++ b/drivers/video/ati_radeon_fb.c @@ -35,8 +35,6 @@ #include common.h -#ifdef CONFIG_ATI_RADEON_FB - #include command.h #include pci.h #include asm/processor.h @@ -777,4 +775,3 @@ void video_set_lut (unsigned int index, /* color number */ OUTREG(PALETTE_INDEX, index); OUTREG(PALETTE_DATA, (r 16) | (g 8) | b); } -#endif diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 68b9861..dce2a24 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -92,8 +92,6 @@ CONFIG_VIDEO_HW_CURSOR:- Uses the hardware cursor capability of the #include common.h -#ifdef CONFIG_CFB_CONSOLE - #include malloc.h /*/ @@ -1337,4 +1335,3 @@ int drv_video_init (void) /* No console dev available */ return 0; } -#endif /* CONFIG_CFB_CONSOLE */ diff --git a/drivers/video/ct69000.c b/drivers/video/ct69000.c index 29d82e4..cae662e 100644 --- a/drivers/video/ct69000.c +++ b/drivers/video/ct69000.c @@ -31,8 +31,6 @@ #include video_fb.h #include videomodes.h -#ifdef CONFIG_VIDEO_CT69000 - /* debug */ #undef VGA_DEBUG #undef VGA_DUMP_REG @@ -1280,7 +1278,4 @@ video_hw_bitblt (unsigned int bpp,/* bytes per pixel */ out32r (pGD-pciBase + BR08_o, (dim_y 16) + dim_x); /* start the BITBlt */ video_wait_bitblt (pGD-pciBase + BR04_o); } - -#endif /* CONFIG_CT69000 */ - #endif /* CONFIG_VIDEO */ diff --git a/drivers/video/mb862xx.c b/drivers/video/mb862xx.c index 733d9a2..6c14b0d 100644 --- a/drivers/video/mb862xx.c +++ b/drivers/video/mb862xx.c @@ -28,8 +28,6 @@ #include common.h -#if defined(CONFIG_VIDEO_MB862xx) - #include asm/io.h #include pci.h #include video_fb.h @@ -416,4 +414,3 @@ void video_hw_bitblt (unsigned int bpp, unsigned int src_x, unsigned int src_y, DE_WR_FIFO ((height 16) | width); de_wait (); /* sync */ } -#endif /* CONFIG_VIDEO_MB862xx */ diff --git a/drivers/video/sed13806.c b/drivers/video/sed13806.c index 6996ca8..9cd19b5 100644 --- a/drivers/video/sed13806.c +++ b/drivers/video/sed13806.c @@ -25,8 +25,6 @@ #include common.h -#ifdef CONFIG_VIDEO_SED13806 - #include video_fb.h #include sed13806.h @@ -307,4 +305,3 @@ void video_init_hw_cursor (int font_width, int font_height) writeByte (LCD_CURSOR_CNTL, 1); } #endif -#endif diff --git a/drivers/video/sed156x.c b/drivers/video/sed156x.c index e9d5ed4..707250d 100644 --- a/drivers/video/sed156x.c +++ b/drivers/video/sed156x.c @@ -28,8 +28,6 @@ #include sed156x.h -#ifdef CONFIG_SED156X - /* configure according to the selected display */ #if defined(CONFIG_SED156X_PG12864Q) #define LCD_WIDTH 128 @@ -562,5 +560,3 @@ void sed156x_init(void) sed156x_sync(); sed156x_cmd_transfer(LCD_ON); /* Turn display ON */ } - -#endif /* CONFIG_SED156X */ diff --git a/drivers/video/sm501.c b/drivers/video/sm501.c index 23db02c..283d2d9 100644 --- a/drivers/video/sm501.c +++ b/drivers/video/sm501.c @@ -31,8 +31,6 @@ #include common.h -#ifdef CONFIG_VIDEO_SM501 - #include video_fb.h #include sm501.h @@ -146,5 +144,3 @@ void video_set_lut ( ) { } - -#endif /* CONFIG_VIDEO_SM501 */ diff --git a/drivers/video/smiLynxEM.c b/drivers/video/smiLynxEM.c index 20f9beb..390dd56 100644 ---
[U-Boot-Users] [PATCH v2] Fix some more printf() format problems.
Signed-off-by: Kumar Gala [EMAIL PROTECTED] --- updated based on comments from Jean. - k common/cmd_mp.c |2 +- cpu/mpc85xx/mp.c |4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/cmd_mp.c b/common/cmd_mp.c index 26a57c5..b2a397c 100644 --- a/common/cmd_mp.c +++ b/common/cmd_mp.c @@ -35,7 +35,7 @@ cpu_cmd(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) cpuid = simple_strtoul(argv[1], NULL, 10); if (cpuid = CONFIG_NR_CPUS) { - printf (Core num: %d is out of range[0..%d]\n, + printf (Core num: %lu is out of range[0..%d]\n, cpuid, CONFIG_NR_CPUS - 1); return 1; } diff --git a/cpu/mpc85xx/mp.c b/cpu/mpc85xx/mp.c index a527cf3..554830f 100644 --- a/cpu/mpc85xx/mp.c +++ b/cpu/mpc85xx/mp.c @@ -50,12 +50,12 @@ int cpu_status(int nr) if (nr == id) { table = (u32 *)get_spin_addr(); - printf(table base @ 0x%08x\n, table); + printf(table base @ 0x%p\n, table); } else { table = (u32 *)get_spin_addr() + nr * NUM_BOOT_ENTRY; printf(Running on cpu %d\n, id); printf(\n); - printf(table @ 0x%08x:\n, table); + printf(table @ 0x%p\n, table); printf( addr - 0x%08x\n, table[BOOT_ENTRY_ADDR_LOWER]); printf( pir - 0x%08x\n, table[BOOT_ENTRY_PIR]); printf( r3 - 0x%08x\n, table[BOOT_ENTRY_R3_LOWER]); -- 1.5.5.1 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH][resubmit] QE IO: Add initial data to pin configuration + read/write functions
Anyway, I'll wait for Kim's ACK before pushing it up into my dev-1.3.4 branch see: http://article.gmane.org/gmane.comp.boot-loaders.u-boot/38991 David, I'm still waiting for a response to Kim's comments before I can apply this. The window for 1.3.5 will open soon, so it'd be good to get a working version of this patch sent out by then. Andy - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [REPOST][PATCH 1/4] 85xx: Cleanup L2 cache size detection
The L2 size detection code was a bit confusing and we kept having to add code to it to handle new processors. Change the sense of detection so we look for the older processors that aren't changing. Also added support for 1M cache size on 8572. Signed-off-by: Kumar Gala [EMAIL PROTECTED] --- cpu/mpc85xx/cpu_init.c | 47 ++- 1 files changed, 30 insertions(+), 17 deletions(-) diff --git a/cpu/mpc85xx/cpu_init.c b/cpu/mpc85xx/cpu_init.c index 736aef1..4feb751 100644 --- a/cpu/mpc85xx/cpu_init.c +++ b/cpu/mpc85xx/cpu_init.c @@ -261,37 +261,50 @@ int cpu_init_r(void) volatile uint cache_ctl; uint svr, ver; uint l2srbar; + u32 l2siz_field; svr = get_svr(); ver = SVR_SOC_VER(svr); asm(msync;isync); cache_ctl = l2cache-l2ctl; + l2siz_field = (cache_ctl 28) 0x3; - switch (cache_ctl 0x3000) { - case 0x2000: - if (ver == SVR_8548 || ver == SVR_8548_E || - ver == SVR_8544 || ver == SVR_8568_E) { - puts (512 KB ); - /* set L2E=1, L2I=1, L2SRAM=0 */ - cache_ctl = 0xc000; + switch (l2siz_field) { + case 0x0: + printf( unknown size (0x%08x)\n, cache_ctl); + return -1; + break; + case 0x1: + if (ver == SVR_8540 || ver == SVR_8560 || + ver == SVR_8541 || ver == SVR_8541_E || + ver == SVR_8555 || ver == SVR_8555_E) { + puts(128 KB ); + /* set L2E=1, L2I=1, L2BLKSZ=1 (128 Kbyte) */ + cache_ctl = 0xc400; } else { puts(256 KB ); + cache_ctl = 0xc000; /* set L2E=1, L2I=1, L2SRAM=0 */ + } + break; + case 0x2: + if (ver == SVR_8540 || ver == SVR_8560 || + ver == SVR_8541 || ver == SVR_8541_E || + ver == SVR_8555 || ver == SVR_8555_E) { + puts(256 KB ); /* set L2E=1, L2I=1, L2BLKSZ=2 (256 Kbyte) */ cache_ctl = 0xc800; + } else { + puts (512 KB ); + /* set L2E=1, L2I=1, L2SRAM=0 */ + cache_ctl = 0xc000; } break; - case 0x1000: - puts(256 KB ); - if (ver == SVR_8544 || ver == SVR_8544_E) { - cache_ctl = 0xc000; /* set L2E=1, L2I=1, L2SRAM=0 */ - } + case 0x3: + puts(1024 KB ); + /* set L2E=1, L2I=1, L2SRAM=0 */ + cache_ctl = 0xc000; break; - case 0x3000: - case 0x: - default: - printf( unknown size (0x%08x)\n, cache_ctl); - return -1; } if (l2cache-l2ctl 0x8000) { -- 1.5.5.1 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [REPOST][PATCH 2/4] MPC8544DS: Report board id, board version and fpga version.
Signed-off-by: Kumar Gala [EMAIL PROTECTED] --- board/freescale/mpc8544ds/mpc8544ds.c |5 - 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c index 8c4b040..c39ce11 100644 --- a/board/freescale/mpc8544ds/mpc8544ds.c +++ b/board/freescale/mpc8544ds/mpc8544ds.c @@ -49,7 +49,10 @@ int checkboard (void) if ((uint)gur-porpllsr != 0xe00e) { printf(immap size error %lx\n,(ulong)gur-porpllsr); } - printf (Board: MPC8544DS\n); + printf (Board: MPC8544DS, System ID: 0x%02x, + System Version: 0x%02x, FPGA Version: 0x%02x\n, + in8(PIXIS_BASE + PIXIS_ID), in8(PIXIS_BASE + PIXIS_VER), + in8(PIXIS_BASE + PIXIS_PVER)); lbc-ltesr = 0x;/* Clear LBC error interrupts */ lbc-lteir = 0x;/* Enable LBC error interrupts */ -- 1.5.5.1 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [REPOST][PATCH 4/4] MPC8544DS: Add ATI Video card support
Add support for using a PCIe ATI Video card on PCIe2. Signed-off-by: Kumar Gala [EMAIL PROTECTED] --- board/freescale/mpc8544ds/u-boot.lds |1 + include/configs/MPC8544DS.h | 24 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/board/freescale/mpc8544ds/u-boot.lds b/board/freescale/mpc8544ds/u-boot.lds index 785a006..c66c69f 100644 --- a/board/freescale/mpc8544ds/u-boot.lds +++ b/board/freescale/mpc8544ds/u-boot.lds @@ -71,6 +71,7 @@ SECTIONS lib_generic/crc32.o (.text) lib_ppc/extable.o (.text) lib_generic/zlib.o (.text) +drivers/bios_emulator/atibios.o (.text) *(.text) *(.fixup) *(.got1) diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 669f4d7..a0e4df8 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -226,7 +226,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CFG_INIT_SP_OFFSET CFG_GBL_DATA_OFFSET #define CFG_MONITOR_LEN(256 * 1024) /* Reserve 256 kB for Mon */ -#define CFG_MALLOC_LEN (128 * 1024)/* Reserved for malloc */ +#define CFG_MALLOC_LEN (1024 * 1024) /* Reserved for malloc */ /* Serial Port - controlled on board with jumper J8 * open - index 2 @@ -314,6 +314,26 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #if defined(CONFIG_PCI) +/*PCIE video card used*/ +#define VIDEO_IO_OFFSETCFG_PCIE2_IO_PHYS + +/*PCI video card used*/ +/*#define VIDEO_IO_OFFSET CFG_PCI1_IO_PHYS*/ + +/* video */ +#define CONFIG_VIDEO + +#if defined(CONFIG_VIDEO) +#define CONFIG_BIOSEMU +#define CONFIG_CFB_CONSOLE +#define CONFIG_VIDEO_SW_CURSOR +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_ATI_RADEON_FB +#define CONFIG_VIDEO_LOGO +/*#define CONFIG_CONSOLE_CURSOR*/ +#define CFG_ISA_IO_BASE_ADDRESS VIDEO_IO_OFFSET +#endif + #define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ @@ -382,7 +402,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #if CFG_MONITOR_BASE 0xfff8 #define CFG_ENV_ADDR 0xfff8 #else -#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x4) +#define CFG_ENV_ADDR (CFG_MONITOR_BASE + 0x7) #endif #define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SECT_SIZE 0x1 /* 64K (one sector) */ -- 1.5.5.1 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] ppc4xx [Resubmit] [PATCH] CPU PPC440x5 on Virtex5 FX (new version)
Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- -This patchs gives support for the embbedded ppc440 on the Virtex5 FPGAs -interrupts.c divided in uic.c and interrupts.c -xilinx_irq.c for xilinx interrupt controller cpu/ppc4xx/Makefile | 15 +++- cpu/ppc4xx/cpu.c|4 + cpu/ppc4xx/interrupts.c | 178 ++--- cpu/ppc4xx/speed.c |6 +- cpu/ppc4xx/uic.c| 238 +++ cpu/ppc4xx/xilinx_irq.c | 113 include/asm-ppc/interrupt.h | 50 + include/asm-ppc/processor.h |2 + 8 files changed, 456 insertions(+), 150 deletions(-) create mode 100644 cpu/ppc4xx/uic.c create mode 100644 cpu/ppc4xx/xilinx_irq.c create mode 100644 include/asm-ppc/interrupt.h diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile index 800bb41..b006127 100644 --- a/cpu/ppc4xx/Makefile +++ b/cpu/ppc4xx/Makefile @@ -35,10 +35,14 @@ SOBJS += kgdb.o COBJS := 40x_spd_sdram.o COBJS += 44x_spd_ddr.o COBJS += 44x_spd_ddr2.o -COBJS += 4xx_enet.o +ifndef CONFIG_XILINX_440 +COBJS += 4xx_enet.o +endif COBJS += 4xx_pci.o COBJS += 4xx_pcie.o +ifndef CONFIG_XILINX_440 COBJS += 4xx_uart.o +endif COBJS += bedbug_405.o COBJS += commproc.o COBJS += cpu.o @@ -47,11 +51,20 @@ COBJS += denali_data_eye.o COBJS += denali_spd_ddr2.o COBJS += ecc.o COBJS += fdt.o +ifndef CONFIG_XILINX_440 COBJS += gpio.o +endif COBJS += i2c.o COBJS += interrupts.o +ifndef CONFIG_XILINX_440 +COBJS += uic.o +else +COBJS += xilinx_irq.o +endif COBJS += iop480_uart.o +ifndef CONFIG_XILINX_440 COBJS += miiphy.o +endif COBJS += ndfc.o COBJS += sdram.o COBJS += speed.o diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index ef32bc6..2b9b364 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -541,6 +541,10 @@ int checkcpu (void) puts(GX Rev. A); strcpy(addstr, No Security support); break; + + case PVR_VIRTEX5: + puts( VIRTEX5); + break; default: printf ( UNKNOWN (PVR=%08x), pvr); diff --git a/cpu/ppc4xx/interrupts.c b/cpu/ppc4xx/interrupts.c index 8215dc6..58d1d81 100644 --- a/cpu/ppc4xx/interrupts.c +++ b/cpu/ppc4xx/interrupts.c @@ -8,6 +8,10 @@ * (C) Copyright 2003 (440GX port) * Travis B. Sawyer, Sandburst Corporation, [EMAIL PROTECTED] * + * (C) Copyright 2008 (PPC440X05 port for Virtex 5 FX) + * Ricardo Ribalda-Universidad Autonoma de [EMAIL PROTECTED] + * Work supported by Qtechnology (htpp://qtec.com) + * * See file CREDITS for list of people who contributed to this * project. * @@ -31,23 +35,11 @@ #include watchdog.h #include command.h #include asm/processor.h +#include asm/interrupt.h #include ppc4xx.h #include ppc_asm.tmpl #include commproc.h -#if (UIC_MAX 3) -#define UICB0_ALL (UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI) | \ -UIC_MASK(VECNUM_UIC2CI) | UIC_MASK(VECNUM_UIC2NCI) | \ -UIC_MASK(VECNUM_UIC3CI) | UIC_MASK(VECNUM_UIC3NCI)) -#elif (UIC_MAX 2) -#define UICB0_ALL (UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI) | \ -UIC_MASK(VECNUM_UIC2CI) | UIC_MASK(VECNUM_UIC2NCI)) -#elif (UIC_MAX 1) -#define UICB0_ALL (UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI)) -#else -#define UICB0_ALL 0 -#endif - DECLARE_GLOBAL_DATA_PTR; /* @@ -58,11 +50,7 @@ struct irq_action { void *arg; int count; }; - -static struct irq_action irq_vecs[UIC_MAX * 32]; - -u32 get_dcr(u16); -void set_dcr(u16, u32); +static struct irq_action irq_vecs[IRQ_MAX]; #if defined(CONFIG_440) @@ -103,7 +91,7 @@ int interrupt_init_cpu (unsigned *decrementer_count) /* * Mark all irqs as free */ - for (vec = 0; vec (UIC_MAX * 32); vec++) { + for (vec = 0; vec IRQ_MAX; vec++) { irq_vecs[vec].handler = NULL; irq_vecs[vec].arg = NULL; irq_vecs[vec].count = 0; @@ -147,110 +135,36 @@ int interrupt_init_cpu (unsigned *decrementer_count) */ set_evpr(0x); -#if (UIC_MAX 1) - /* Install the UIC1 handlers */ - irq_install_handler(VECNUM_UIC1NCI, (void *)(void *)external_interrupt, 0); - irq_install_handler(VECNUM_UIC1CI, (void *)(void *)external_interrupt, 0); -#endif -#if (UIC_MAX 2) - irq_install_handler(VECNUM_UIC2NCI, (void *)(void *)external_interrupt, 0); - irq_install_handler(VECNUM_UIC2CI, (void *)(void *)external_interrupt, 0); -#endif -#if (UIC_MAX 3) - irq_install_handler(VECNUM_UIC3NCI, (void *)(void *)external_interrupt, 0); - irq_install_handler(VECNUM_UIC3CI, (void *)(void *)external_interrupt, 0); -#endif + /* +*Call uic or xilinx_irq pic_enable +*/ + pic_enable(); return (0); } -/* Handler for UIC interrupt */
[U-Boot-Users] ppc4xx: [PATCH] [Resubmit] ML507 Board Support
Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- Support for the ML507 Board by Xilinx CREDITS |5 ++ MAINTAINERS |4 + MAKEALL |1 + Makefile |3 + board/xilinx/ml507/Makefile | 58 + board/xilinx/ml507/config.mk | 24 +++ board/xilinx/ml507/init.S| 44 + board/xilinx/ml507/ml507.c | 46 + board/xilinx/ml507/u-boot.lds| 130 ++ board/xilinx/ml507/xparameters.h | 34 ++ include/configs/ml507.h | 107 +++ 11 files changed, 456 insertions(+), 0 deletions(-) create mode 100644 board/xilinx/ml507/Makefile create mode 100644 board/xilinx/ml507/config.mk create mode 100644 board/xilinx/ml507/init.S create mode 100644 board/xilinx/ml507/ml507.c create mode 100644 board/xilinx/ml507/u-boot.lds create mode 100644 board/xilinx/ml507/xparameters.h create mode 100644 include/configs/ml507.h diff --git a/CREDITS b/CREDITS index 3b6e57d..260a84b 100644 --- a/CREDITS +++ b/CREDITS @@ -399,6 +399,11 @@ N: Stelian Pop E: [EMAIL PROTECTED] D: Atmel AT91CAP9ADK support +N: Ricardo Ribalda Delgado +E: [EMAIL PROTECTED] +D: PPC440x5 (Virtex5), ML507 Board +W: http://www.ii.uam.es/~rribalda + N: Stefan Roese E: [EMAIL PROTECTED] D: AMCC PPC4xx Support diff --git a/MAINTAINERS b/MAINTAINERS index b667c8e..75b5b02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -311,6 +311,10 @@ Daniel Poirot [EMAIL PROTECTED] sbc8240 MPC8240 sbc405 PPC405GP +Ricardo Ribalda [EMAIL PROTECTED] + + ml507 PPC440x5 + Stefan Roese [EMAIL PROTECTED] P3M7448 MPC7448 diff --git a/MAKEALL b/MAKEALL index a256e9a..5463a58 100755 --- a/MAKEALL +++ b/MAKEALL @@ -239,6 +239,7 @@ LIST_4xx= \ yosemite\ yucca \ zeus\ + ml507 \ # diff --git a/Makefile b/Makefile index 10a3e06..40029e6 100644 --- a/Makefile +++ b/Makefile @@ -1336,6 +1336,9 @@ ML2_config: unconfig ml300_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx +ml507_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml507 xilinx + ocotea_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ocotea amcc diff --git a/board/xilinx/ml507/Makefile b/board/xilinx/ml507/Makefile new file mode 100644 index 000..3b144de --- /dev/null +++ b/board/xilinx/ml507/Makefile @@ -0,0 +1,58 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# 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 +# + +include $(TOPDIR)/config.mk +ifneq ($(OBJTREE),$(SRCTREE)) +endif + +INCS := +CFLAGS += $(INCS) +HOST_CFLAGS+= $(INCS) + +LIB= $(obj)lib$(BOARD).a + +COBJS = $(BOARD).o \ + +SOBJS = init.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $^ + +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/xilinx/ml507/config.mk b/board/xilinx/ml507/config.mk new file mode 100644 index 000..35c52ad --- /dev/null +++ b/board/xilinx/ml507/config.mk @@ -0,0 +1,24 @@ +# +# (C) Copyright 2000 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# 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
Re: [U-Boot-Users] [PATCH, resend] FDT memory and pci node fixes for MPC8260ADS
In message [EMAIL PROTECTED] you wrote: +#if defined(CONFIG_OF_LIBFDT) +void ft_pci_setup(void *blob, bd_t *bd) +{ + do_fixup_by_prop_u32(blob, device_type, pci, 4, + clock-frequency, bd-pci_clk, 1); +} +#endif Your patch causes problems: Configuring for MPC8260ADS board... pci.c: In function 'ft_pci_setup': pci.c:460: error: 'bd_t' has no member named 'pci_clk' make[1]: *** [pci.o] Error 1 Do you have a quick fix or shall I back out the patch? This problem can be temporary fixed with replacement of the gd-pci_clk by CONFIG_8260_CLKIN. Can you please submit a patch? 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: [EMAIL PROTECTED] The X11 source code style is ATROCIOUS and should not be used as a model. - Doug Gwyn - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] Fix printf() format issues with sizeof_t types by using %zu
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD [EMAIL PROTECTED] Signed-off-by: Wolfgang Denk [EMAIL PROTECTED] --- common/lcd.c|2 +- cpu/mpc8xx/video.c |4 ++-- drivers/serial/usbtty.c |4 ++-- fs/jffs2/jffs2_1pass.c | 10 ++ fs/jffs2/jffs2_nand_1pass.c | 10 ++ lib_m68k/board.c|4 ++-- lib_mips/board.c|4 ++-- lib_ppc/board.c |4 ++-- net/bootp.c |2 +- 9 files changed, 24 insertions(+), 20 deletions(-) diff --git a/common/lcd.c b/common/lcd.c index ebf377a..04ef4e3 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -539,7 +539,7 @@ void bitmap_plot (int x, int y) debug (Logo: width %d height %d colors %d cmap %d\n, BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS, - sizeof(bmp_logo_palette)/(sizeof(ushort))); + (int)(sizeof(bmp_logo_palette)/(sizeof(ushort; bmap = bmp_logo_bitmap[0]; fb = (uchar *)(lcd_base + y * lcd_line_length + x); diff --git a/cpu/mpc8xx/video.c b/cpu/mpc8xx/video.c index 8bf8e46..ef91165 100644 --- a/cpu/mpc8xx/video.c +++ b/cpu/mpc8xx/video.c @@ -833,10 +833,10 @@ static void video_encoder_init (void) puts ([VIDEO ENCODER] Configuring the encoder...\n); - printf (Sending %d bytes (@ %08lX) to I2C 0x%X:\n , + printf (Sending %zu bytes (@ %08lX) to I2C 0x%lX:\n , sizeof(video_encoder_data), (ulong)video_encoder_data, - VIDEO_I2C_ADDR); + (ulong)VIDEO_I2C_ADDR); for (i=0; isizeof(video_encoder_data); ++i) { printf( %02X, video_encoder_data[i]); } diff --git a/drivers/serial/usbtty.c b/drivers/serial/usbtty.c index cc2bdac..2bc5c3c 100644 --- a/drivers/serial/usbtty.c +++ b/drivers/serial/usbtty.c @@ -529,8 +529,8 @@ int drv_usbtty_init (void) } snlen = strlen(sn); if (snlen sizeof(serial_number) - 1) { - printf (Warning: serial number %s is too long (%d %d)\n, - sn, snlen, sizeof(serial_number) - 1); + printf (Warning: serial number %s is too long (%d %lu)\n, + sn, snlen, (ulong)(sizeof(serial_number) - 1)); snlen = sizeof(serial_number) - 1; } memcpy (serial_number, sn, snlen); diff --git a/fs/jffs2/jffs2_1pass.c b/fs/jffs2/jffs2_1pass.c index 5c1d265..8a06777 100644 --- a/fs/jffs2/jffs2_1pass.c +++ b/fs/jffs2/jffs2_1pass.c @@ -1213,16 +1213,18 @@ jffs2_1pass_build_lists(struct part_info * part) } else if (node-nodetype == JFFS2_NODETYPE_CLEANMARKER) { if (node-totlen != sizeof(struct jffs2_unknown_node)) printf(OOPS Cleanmarker has bad size - %d != %u\n, node-totlen, + %d != %zu\n, + node-totlen, sizeof(struct jffs2_unknown_node)); } else if (node-nodetype == JFFS2_NODETYPE_PADDING) { if (node-totlen sizeof(struct jffs2_unknown_node)) printf(OOPS Padding has bad size - %d %u\n, node-totlen, + %d %zu\n, + node-totlen, sizeof(struct jffs2_unknown_node)); } else { - printf(Unknown node type: %x len %d - offset 0x%x\n, node-nodetype, + printf(Unknown node type: %x len %d offset 0x%x\n, + node-nodetype, node-totlen, offset); } offset += ((node-totlen + 3) ~3); diff --git a/fs/jffs2/jffs2_nand_1pass.c b/fs/jffs2/jffs2_nand_1pass.c index d95f551..3ce9c98 100644 --- a/fs/jffs2/jffs2_nand_1pass.c +++ b/fs/jffs2/jffs2_nand_1pass.c @@ -864,16 +864,18 @@ jffs2_1pass_build_lists(struct part_info * part) } else if (node-nodetype == JFFS2_NODETYPE_CLEANMARKER) { if (node-totlen != sizeof(struct jffs2_unknown_node)) printf(OOPS Cleanmarker has bad size - %d != %d\n, node-totlen, + %d != %zu\n, + node-totlen, sizeof(struct jffs2_unknown_node)); }
[U-Boot-Users] [PATCH] EB+MCF-EV123 board: fix syntx error
Signed-off-by: Wolfgang Denk [EMAIL PROTECTED] --- board/BuS/EB+MCF-EV123/EB+MCF-EV123.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c index fad9c40..c7e83d9 100644 --- a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c +++ b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c @@ -51,7 +51,7 @@ phys_size_t initdram (int board_type) MCFSDRAMC_DACR0 = MCFSDRAMC_DACR_BASE(CFG_SDRAM_BASE0) | MCFSDRAMC_DACR_CASL(1) | MCFSDRAMC_DACR_CBM(3) - | MCFSDRAMC_DACR_PS_16); + | MCFSDRAMC_DACR_PS_16; MCFSDRAMC_DMR0 =MCFSDRAMC_DMR_BAM_16M | MCFSDRAMC_DMR_V; -- 1.5.6.1 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] AmigaOneG3SE: remove dead and incomplete files
Signed-off-by: Wolfgang Denk [EMAIL PROTECTED] --- board/MAI/menu/menu.c | 66 board/MAI/menu/menu.h | 162 - 2 files changed, 0 insertions(+), 228 deletions(-) delete mode 100644 board/MAI/menu/menu.c delete mode 100644 board/MAI/menu/menu.h diff --git a/board/MAI/menu/menu.c b/board/MAI/menu/menu.c deleted file mode 100644 index c0c63a8..000 --- a/board/MAI/menu/menu.c +++ /dev/null @@ -1,66 +0,0 @@ -#include menu.h - -#define SINGLE_BOX 0 -#define DOUBLE_BOX 1 - -void video_draw_box(int style, int attr, char *title, int separate, int x, int y, int w, int h); -void video_draw_text(int x, int y, int attr, char *text); -void video_save_rect(int x, int y, int w, int h, void *save_area, int clearchar, int clearattr); -void video_restore_rect(int x, int y, int w, int h, void *save_area); -int video_rows(void); -int video_cols(void); - -#define MAX_MENU_OPTIONS 200 - -typedef struct -{ -int used; /* flag if this entry is used */ -int entry_x; /* Character column of the menu entry */ -int entry_y; /* Character line of the entry */ -int option_x; /* Character colum of the option (entry is same) */ -} option_data_t; - -option_data_t odata[MAX_MENU_OPTIONS]; - -int normal_attr = 0x0F; -int select_attr = 0x2F; -int disabled_attr = 0x07; - -menu_t *root_menu; - -int menu_init (menu_t *root) -{ -char *s; -int i; - -s = getenv(menu_normal); -if (s) normal_attr = atoi(s); - -s = getenv(menu_select); -if (s) select_attr = atoi(s); - -s = getenv(menu_disabled); -if (s) disabled_attr = atoi(s); - -for (i=0; iMAX_MENU_OPTIONS; i++) odata[i].used = 0; - -root_menu = root; -} - -option_data_t *menu_alloc_odata(void) -{ -int i; -for (int i=0; iMAX_MENU_OPTIONS; i++) -{ - if (odata[i].used == 0) return odata[i]; -} -return NULL; -} - -void menu_free_odata(option_data_t *odata) -{ -odata-used = 0; -} - -void menu_layout (menu_t *menu) -{ diff --git a/board/MAI/menu/menu.h b/board/MAI/menu/menu.h deleted file mode 100644 index 23d89a7..000 --- a/board/MAI/menu/menu.h +++ /dev/null @@ -1,162 +0,0 @@ -#ifndef MENU_H -#define MENU_H - -/* A single menu */ -typedef void (*menu_finish_callback)(struct menu_s *menu); - -typedef struct menu_s { - char *name; /* Menu name */ - int num_options;/* Number of options in this menu */ - int flags; /* Various flags - see below */ - int option_align; /* Aligns options to a field width of this much characters if != 0 */ - - struct menu_option_s **options; /* Pointer to this menu's options */ - menu_finish_callback callback; /* Called when the menu closes */ -} menu_t; - -/* - * type: Type of the option (see below) - * name: Name to display for this option - * help: Optional help string - * id : optional id number - * sys : pointer for system-specific data, init to NULL and don't touch - */ - -#define OPTION_PREAMBLE\ - int type; \ - char *name; \ - char *help; \ - int id; \ - void *sys; - -/* - * Menu option types. - * There are a number of different layouts for menu options depending - * on their types. Currently there are the following possibilities: - * - * Submenu: - * This entry links to a new menu. - * - * Boolean: - * A simple on/off toggle entry. Booleans can be either yes/no, 0/1 or on/off. - * Optionally, this entry can enable/disable a set of other options. An example would - * be to enable/disable on-board USB, and if enabled give access to further options like - * irq settings, base address etc. - * - * Text: - * A single line/limited number of characters text entry box. Text can be restricted - * to a certain charset (digits/hex digits/all/custom). Result is also available as an - * int if numeric. - * - * Selection: - * One-of-many type of selection entry. User may choose on of a set of strings, which - * maps to a specific value for the variable. - * - * Routine: - * Selecting this calls an entry-specific routine. This can be used for saving contents etc. - * - * Custom: - * Display and behaviour of this entry is defined by a set of callbacks. - */ - -#define MENU_SUBMENU_TYPE 0 -typedef struct menu_submenu_s -{ -OPTION_PREAMBLE - -menu_t * submenu;/* Pointer to the submenu */ -} menu_submenu_t; - -#define MENU_BOOLEAN_TYPE 1 -typedef struct menu_boolean_s -{ -OPTION_PREAMBLE - -char *variable;/* Name of the variable to getenv()/setenv() */ -int subtype; /* Subtype (on/off, 0/1, yes/no, enable/disable), see below */ -int mutex; /* Bit mask of options to enable/disable. Bit 0 is the option - immediately following this
[U-Boot-Users] [PATCH] EB+MCF-EV123 board: fix coding style (alingment)
Signed-off-by: Wolfgang Denk [EMAIL PROTECTED] --- board/BuS/EB+MCF-EV123/EB+MCF-EV123.c | 86 1 files changed, 43 insertions(+), 43 deletions(-) diff --git a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c index c7e83d9..39c97b1 100644 --- a/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c +++ b/board/BuS/EB+MCF-EV123/EB+MCF-EV123.c @@ -41,51 +41,51 @@ int checkboard (void) phys_size_t initdram (int board_type) { - int size,i; + int size, i; size = 0; - MCFSDRAMC_DCR = MCFSDRAMC_DCR_RTIM_6 - | MCFSDRAMC_DCR_RC((15 * CFG_CLK)4); - #ifdef CFG_SDRAM_BASE0 - - MCFSDRAMC_DACR0 = MCFSDRAMC_DACR_BASE(CFG_SDRAM_BASE0) - | MCFSDRAMC_DACR_CASL(1) - | MCFSDRAMC_DACR_CBM(3) - | MCFSDRAMC_DACR_PS_16; - - MCFSDRAMC_DMR0 =MCFSDRAMC_DMR_BAM_16M - | MCFSDRAMC_DMR_V; - - MCFSDRAMC_DACR0 |= MCFSDRAMC_DACR_IP; - - *(unsigned short *)(CFG_SDRAM_BASE0) = 0xA5A5; - MCFSDRAMC_DACR0 |= MCFSDRAMC_DACR_RE; - for (i=0; i 2000; i++) - asm( nop); - mbar_writeLong(MCFSDRAMC_DACR0, mbar_readLong(MCFSDRAMC_DACR0) - | MCFSDRAMC_DACR_IMRS); - *(unsigned int *)(CFG_SDRAM_BASE0 + 0x220) = 0xA5A5; - size += CFG_SDRAM_SIZE * 1024 * 1024; - #endif - #ifdef CFG_SDRAM_BASE1 - MCFSDRAMC_DACR1 = MCFSDRAMC_DACR_BASE(CFG_SDRAM_BASE1) - | MCFSDRAMC_DACR_CASL(1) - | MCFSDRAMC_DACR_CBM(3) - | MCFSDRAMC_DACR_PS_16; - - MCFSDRAMC_DMR1 =MCFSDRAMC_DMR_BAM_16M - | MCFSDRAMC_DMR_V; - - MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_IP; - - *(unsigned short *)(CFG_SDRAM_BASE1) = 0xA5A5; - MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_RE; - for (i=0; i 2000; i++) - asm( nop); - MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_IMRS; - *(unsigned int *)(CFG_SDRAM_BASE1 + 0x220) = 0xA5A5; - size += CFG_SDRAM_SIZE1 * 1024 * 1024; - #endif + MCFSDRAMC_DCR = MCFSDRAMC_DCR_RTIM_6 + | MCFSDRAMC_DCR_RC ((15 * CFG_CLK) 4); +#ifdef CFG_SDRAM_BASE0 + + MCFSDRAMC_DACR0 = MCFSDRAMC_DACR_BASE (CFG_SDRAM_BASE0) + | MCFSDRAMC_DACR_CASL (1) + | MCFSDRAMC_DACR_CBM (3) + | MCFSDRAMC_DACR_PS_16; + + MCFSDRAMC_DMR0 = MCFSDRAMC_DMR_BAM_16M | MCFSDRAMC_DMR_V; + + MCFSDRAMC_DACR0 |= MCFSDRAMC_DACR_IP; + + *(unsigned short *) (CFG_SDRAM_BASE0) = 0xA5A5; + MCFSDRAMC_DACR0 |= MCFSDRAMC_DACR_RE; + for (i = 0; i 2000; i++) + asm ( nop); + mbar_writeLong (MCFSDRAMC_DACR0, + mbar_readLong (MCFSDRAMC_DACR0) | MCFSDRAMC_DACR_IMRS); + *(unsigned int *) (CFG_SDRAM_BASE0 + 0x220) = 0xA5A5; + size += CFG_SDRAM_SIZE * 1024 * 1024; +#endif +#ifdef CFG_SDRAM_BASE1 + MCFSDRAMC_DACR1 = MCFSDRAMC_DACR_BASE (CFG_SDRAM_BASE1) + | MCFSDRAMC_DACR_CASL (1) + | MCFSDRAMC_DACR_CBM (3) + | MCFSDRAMC_DACR_PS_16; + + MCFSDRAMC_DMR1 = MCFSDRAMC_DMR_BAM_16M | MCFSDRAMC_DMR_V; + + MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_IP; + + *(unsigned short *) (CFG_SDRAM_BASE1) = 0xA5A5; + MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_RE; + + for (i = 0; i 2000; i++) + asm ( nop); + + MCFSDRAMC_DACR1 |= MCFSDRAMC_DACR_IMRS; + *(unsigned int *) (CFG_SDRAM_BASE1 + 0x220) = 0xA5A5; + size += CFG_SDRAM_SIZE1 * 1024 * 1024; +#endif return size; } -- 1.5.6.1 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] cpu/i386/serial.c: Fix syntax errors
Signed-off-by: Wolfgang Denk [EMAIL PROTECTED] --- cpu/i386/serial.c |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/i386/serial.c b/cpu/i386/serial.c index baf35e5..8b5f8fa 100644 --- a/cpu/i386/serial.c +++ b/cpu/i386/serial.c @@ -413,8 +413,8 @@ void kgdb_serial_init(void) * Init onboard 16550 UART */ outb(0x80, UART1_BASE + UART_LCR); /* set DLAB bit */ - outb(bdiv 0xff), UART1_BASE + UART_DLL); /* set divisor for 9600 baud */ - outb(bdiv 8), UART1_BASE + UART_DLM);/* set divisor for 9600 baud */ + outb((bdiv 0xff), UART1_BASE + UART_DLL); /* set divisor for 9600 baud */ + outb((bdiv 8 ), UART1_BASE + UART_DLM); /* set divisor for 9600 baud */ outb(0x03, UART1_BASE + UART_LCR); /* line control 8 bits no parity */ outb(0x00, UART1_BASE + UART_FCR); /* disable FIFO */ outb(0x00, UART1_BASE + UART_MCR); /* no modem control DTR RTS */ -- 1.5.6.1 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] Fix coding style; make code better parsable by external tools
Signed-off-by: Wolfgang Denk [EMAIL PROTECTED] --- board/snmc/qs850/qs850.c | 17 + 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/board/snmc/qs850/qs850.c b/board/snmc/qs850/qs850.c index ba5a8fb..2fbe8ae 100644 --- a/board/snmc/qs850/qs850.c +++ b/board/snmc/qs850/qs850.c @@ -86,6 +86,13 @@ const uint sdram_table[] = * * Always return 1 */ +#if defined(CONFIG_QS850) +#define BOARD_IDENTITY QS850 +#elif defined(CONFIG_QS823) +#define BOARD_IDENTITY QS823 +#else +#defineBOARD_IDENTITY QS??? +#endif int checkboard (void) { @@ -96,14 +103,8 @@ int checkboard (void) i = getenv_r(serial#, buf, sizeof(buf)); s = (i0) ? buf : NULL; -#ifdef CONFIG_QS850 - if (!s || strncmp(s, QS850, 5)) { - puts (### No HW ID - assuming QS850); -#endif -#ifdef CONFIG_QS823 - if (!s || strncmp(s, QS823, 5)) { - puts (### No HW ID - assuming QS823); -#endif + if (!s || strncmp(s, BOARD_IDENTITY, 5)) { + puts (### No HW ID - assuming BOARD_IDENTITY); } else { for (e=s; *e; ++e) { if (*e == ' ') -- 1.5.6.1 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH] elppc board: Coding style cleanup.
Signed-off-by: Wolfgang Denk [EMAIL PROTECTED] --- board/eltec/elppc/eepro100_srom.c | 99 +++-- 1 files changed, 50 insertions(+), 49 deletions(-) diff --git a/board/eltec/elppc/eepro100_srom.c b/board/eltec/elppc/eepro100_srom.c index 1b6d1e0..4a9da54 100644 --- a/board/eltec/elppc/eepro100_srom.c +++ b/board/eltec/elppc/eepro100_srom.c @@ -31,82 +31,83 @@ #include net.h #include srom.h -extern int eepro100_write_eeprom (struct eth_device* dev, - int location, int addr_len, unsigned short data); +extern int eepro100_write_eeprom (struct eth_device *dev, + int location, int addr_len, + unsigned short data); /**/ unsigned short eepro100_srom_checksum (unsigned short *sromdata) { -unsigned short sum = 0; -unsigned int i; - -for (i = 0; i (EE_SIZE-1); i++) -{ - sum += sromdata[i]; -} -return (EE_CHECKSUM - sum); + unsigned short sum = 0; + unsigned int i; + + for (i = 0; i (EE_SIZE - 1); i++) { + sum += sromdata[i]; + } + return (EE_CHECKSUM - sum); } /**/ int eepro100_srom_store (unsigned short *source) { -int count; -struct eth_device onboard_dev; - -/* get onboard network iobase */ -pci_read_config_dword(PCI_BDF(0,0x10,0), PCI_BASE_ADDRESS_0, -(unsigned int *)onboard_dev.iobase); -onboard_dev.iobase = ~0xf; - -source[63] = eepro100_srom_checksum (source); - -for (count=0; count EE_SIZE; count++) -{ -if ( eepro100_write_eeprom ((struct eth_device*)onboard_dev, -count, EE_ADDR_BITS, SROM_SHORT(source)) == -1 ) - return -1; -source++; -} -return 0; + int count; + struct eth_device onboard_dev; + + /* get onboard network iobase */ + pci_read_config_dword (PCI_BDF (0, 0x10, 0), PCI_BASE_ADDRESS_0, + (unsigned int *) onboard_dev.iobase); + onboard_dev.iobase = ~0xf; + + source[63] = eepro100_srom_checksum (source); + + for (count = 0; count EE_SIZE; count++) { + if (eepro100_write_eeprom ((struct eth_device *) onboard_dev, + count, EE_ADDR_BITS, + SROM_SHORT (source)) == -1) { + return -1; + } + source++; + } + return 0; } /**/ #ifdef EEPRO100_SROM_CHECK -extern int read_eeprom (struct eth_device* dev, int location, int addr_len); +extern int read_eeprom (struct eth_device *dev, int location, int addr_len); void eepro100_srom_load (unsigned short *destination) { -int count; -struct eth_device onboard_dev; + int count; + struct eth_device onboard_dev; + #ifdef DEBUG -int lr = 0; -printf (eepro100_srom_download:\n); + int lr = 0; + + printf (eepro100_srom_download:\n); #endif -/* get onboard network iobase */ -pci_read_config_dword(PCI_BDF(0,0x10,0), PCI_BASE_ADDRESS_0, -onboard_dev.iobase); -onboard_dev.iobase = ~0xf; + /* get onboard network iobase */ + pci_read_config_dword (PCI_BDF (0, 0x10, 0), PCI_BASE_ADDRESS_0, + onboard_dev.iobase); + onboard_dev.iobase = ~0xf; -memset (destination, 0x65, 128); + memset (destination, 0x65, 128); -for (count=0; count 0x40; count++) -{ - *destination++ = read_eeprom ((struct eth_device*)onboard_dev, -count, EE_ADDR_BITS); + for (count = 0; count 0x40; count++) { + *destination++ = read_eeprom ((struct eth_device *) onboard_dev, + count, EE_ADDR_BITS); #ifdef DEBUG - printf (%04x , *(destination - 1)); - if (lr++ == 7) - { - printf(\n); - lr = 0; - } + printf (%04x , *(destination - 1)); + if (lr++ == 7) { + printf (\n); + lr = 0; + } #endif -} + } } #endif /* EEPRO100_SROM_CHECK */ -- 1.5.6.1 - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 1/1] Fix some more printf() format issues.
In message [EMAIL PROTECTED] you wrote: Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD [EMAIL PROTECTED] --- common/cmd_flash.c |4 ++-- drivers/usb/usbdcore.c |2 +- fs/jffs2/jffs2_1pass.c |4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) Thanks, but your patch catches only a small part of all uses of sizeof_t in printf() and debug() calls. I tried to find and fix the other locations, too - see [PATCH] Fix printf() format issues with sizeof_t types by using %zu 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: [EMAIL PROTECTED] The universe does not have laws - it has habits, and habits can be broken. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] Fix integer overflow warning in calc_divisor()
In message [EMAIL PROTECTED] you wrote: since you already applied the first patch, I simply thought that the fix for the first patch should have a different subject. I will keep the same subject in the future Thanks. You have another try anyway ;-) The bug is not fixed yet: Configuring for mpc7448hpc2 board... serial.c: In function 'calc_divisor': serial.c:155: warning: integer overflow in expression 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: [EMAIL PROTECTED] Anarchy may not be the best form of government, but it's better than no government at all. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] -rc1 Prerelease ???
Hi everybody, from my point of view I think we're ready for a -rc1 prerelease, but I am aware that some patches are still pending in the queues of some custodians (at least this is what I think), so anybody with pending pull requests please respond quickly! 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: [EMAIL PROTECTED] Copy from one, it's plagiarism; copy from two, it's research. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] -rc1 Prerelease ???
I'm currently pulling together some patches. I will send the pull request *today* On Mon, Jul 14, 2008 at 4:12 PM, Wolfgang Denk [EMAIL PROTECTED] wrote: Hi everybody, from my point of view I think we're ready for a -rc1 prerelease, but I am aware that some patches are still pending in the queues of some custodians (at least this is what I think), so anybody with pending pull requests please respond quickly! 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: [EMAIL PROTECTED] Copy from one, it's plagiarism; copy from two, it's research. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] ARM pull request
Hi, please pull The following changes since commit 348753d416cd2c9e7ec6520a544c8f33cf02a560: Kumar Gala (1): Fix some more printf() format problems. are available in the git repository at: git://git.denx.de/u-boot-arm.git master Hugo Villeneuve (2): ARM DaVinci: Remove duplicate definitions of MACH_TYPE and prototype of i2c_init() ARM DaVinci: Remove extern phy_t declaration by moving code to proper place board/davinci/dv-evm/dv_board.c|9 + board/davinci/schmoogie/dv_board.c |9 + board/davinci/sffsdr/sffsdr.c |6 +- board/davinci/sonata/dv_board.c|9 + cpu/arm926ejs/davinci/ether.c |2 ++ 5 files changed, 6 insertions(+), 29 deletions(-) Best Regards, J. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 1/2] mpc85xx: use IS_E_PROCESSOR macro
On Tue, Jun 17, 2008 at 5:45 PM, Kim Phillips [EMAIL PROTECTED] wrote: Signed-off-by: Kim Phillips [EMAIL PROTECTED] Applied, thanks! I also applied 2/2, since it appears the order needs to be reversed, and it just makes things easier. Andy - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 1/4] ARM DaVinci: Remove duplicate definitions of MACH_TYPE and prototype of i2c_init()
On 15:10 Fri 11 Jul , Hugo Villeneuve wrote: ARM DaVinci: Remove duplicate definitions of MACH_TYPE and prototype of i2c_init(). Signed-off-by: Hugo Villeneuve [EMAIL PROTECTED] --- board/davinci/dv-evm/dv_board.c|3 --- board/davinci/schmoogie/dv_board.c |3 --- board/davinci/sonata/dv_board.c|3 --- 3 files changed, 0 insertions(+), 9 deletions(-) Applied. Thanks. Best regards, J. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 2/4] ARM DaVinci: Remove extern phy_t declaration by moving code to proper place
On 15:10 Fri 11 Jul , Hugo Villeneuve wrote: ARM DaVinci: Remove extern phy_t declaration by moving code to proper place. Signed-off-by: Hugo Villeneuve [EMAIL PROTECTED] --- board/davinci/dv-evm/dv_board.c|6 +- board/davinci/schmoogie/dv_board.c |6 +- board/davinci/sffsdr/sffsdr.c |6 +- board/davinci/sonata/dv_board.c|6 +- cpu/arm926ejs/davinci/ether.c |2 ++ 5 files changed, 6 insertions(+), 20 deletions(-) Applied. Thanks. Best regards, J. - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] PATCH for U-Boot 1.3.3 DHCP fails withnetgearWGR614v6
Wolfgang, On Fri, Jul 11, 2008 at 4:05 PM, Robin Getz [EMAIL PROTECTED] wrote: On Fri 11 Jul 2008 18:41, Ben Warren pondered: I'm a bit of an idealist, so I say let's do it right (remove the call to BootpCopyNetParams()). Unless somebody with some historical perspective weighs in, we'll pull it in as soon as the next merge window opens and see what happens. Fix DHCP protocol so U-Boot does not respond on the network with it's offered IP number until after it has received a DHCP ACK message. Also ensures that U-Boot does it's DHCPREQUEST as broadcast (per RFC 2131). Signed-off-by: Robin Getz [EMAIL PROTECTED] Acked-by: Ben Warren [EMAIL PROTECTED] --- net/bootp.c 2008-07-11 12:05:18.0 -0400 +++ net/bootp.c 2008-07-11 18:58:15.0 -0400 @@ -924,8 +924,6 @@ if (NetReadLong((ulong*)bp-bp_vend[0]) == htonl(BOOTP_VENDOR_MAGIC)) DhcpOptionsProcess((u8 *)bp-bp_vend[4], bp); - BootpCopyNetParams(bp); /* Store net params from reply */ - NetSetTimeout(TIMEOUT * CFG_HZ, BootpTimeout); DhcpSendRequestPkt(bp); #ifdef CFG_BOOTFILE_PREFIX I can't pull this in today. Please apply directly so it gets in RC1 thanks, Ben - Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW! Studies have shown that voting for your favorite open source project, along with a healthy diet, reduces your potential for chronic lameness and boredom. Vote Now at http://www.sourceforge.net/community/cca08 ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] cpu/mpc85xx/start.S: correct temporary TLB
On Wed, Jul 2, 2008 at 9:11 AM, Andrew Klossner [EMAIL PROTECTED] wrote: From 03e28f90637703aaef9356dc398adedcdf06cb94 Mon Sep 17 00:00:00 2001 From: Andrew Klossner [EMAIL PROTECTED] Date: Wed, 2 Jul 2008 07:03:53 -0700 Subject: [PATCH] Change the temp map to ROM to align addresses to page size. With a page size of BOOKE_PAGESZ_16M, both the real and effective addresses must be multiples of 16MB. The hardware silently truncates them so the code happens to work. This patch clarifies the situation by establishing addresses that the hardware doesn't need to truncate. Applied, with Kumar's suggested changes. Thanks, Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] MPC85xx: correct the procedure to change CCSRBAR.
On Wed, Jul 2, 2008 at 9:48 AM, Kumar Gala [EMAIL PROTECTED] wrote: On Jul 2, 2008, at 9:25 AM, Andrew Klossner wrote: The MPC8555E and MPC8548E reference manuals are quite specific about the formula required to change the value of CCSRBAR. This patch implements that formula. Just to be clear, I'm NACKing this for the reasons given by Kumar (also, don't use C++ comments for multi-line comments). Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] 8xxx-fdt: set ns16550 clock from CFG_NS16550_CLK, not bi_busfreq
On Wed, Jul 9, 2008 at 4:53 PM, Kim Phillips [EMAIL PROTECTED] wrote: On Wed, 9 Jul 2008 14:43:46 -0400 Paul Gortmaker [EMAIL PROTECTED] wrote: Some boards that have external 16550 UARTs don't have a direct tie between bi_busfreq and the clock used for the UARTs. Boards that do have such a tie should set CFG_NS16550_CLK to be get_bus_freq(0) -- which most of them do already. Signed-off-by: Paul Gortmaker [EMAIL PROTECTED] Acked-by: Kim Phillips [EMAIL PROTECTED] Applied, thanks Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] mpc85xx: make the MxMR register in upmconfig as a parameter
On Mon, Jul 14, 2008 at 5:54 AM, Sebastian Siewior [EMAIL PROTECTED] wrote: The default value for the MxMR register is not always the right one. This patch adds the value of MxMR register as an additional parameter (plus a few defines instead of hex coded values). Signed-off-by: Sebastian Siewior [EMAIL PROTECTED] I'm not convinced this is the right solution. Anytime we put a cpu-specific #ifdef for a function definition, we should think long and hard about why. Maybe instead of an argument, we should make mxmr_mode a config value. Also, unless I'm misreading this patch, you've broken *every* board with this patch, since there's no change to any of the invokers of upmconfig to supply the fourth argument. Could you also explain in greater detail what you are trying to do, here? My familiarity with the LBC code is fairly low. Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 1/7] sbc8560: proper definitions for TSEC.
On Fri, Jul 11, 2008 at 2:33 PM, Paul Gortmaker [EMAIL PROTECTED] wrote: The definitions for the TSEC have become out of date. There is no longer any such options like CONFIG_MPC85xx_TSEC1 or similar. Update to match those of other boards, like the MPC8560ADS. Signed-off-by: Paul Gortmaker [EMAIL PROTECTED] Acked-by: Ben Warren [EMAIL PROTECTED] Applied, thanks! Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 3/7] sbc8560: define eth0 and eth1 instead of eth1 and eth2
On Fri, Jul 11, 2008 at 5:03 PM, Paul Gortmaker [EMAIL PROTECTED] wrote: Wolfgang Denk wrote: + * MAC addresses directly on it. + */ +#if 0 +#define CONFIG_ETHADDR 00:01:af:07:9b:8a +#define CONFIG_ETH1ADDR 00:01:af:07:9b:8b #define CONFIG_SERVERIP 192.168.0.131 #define CONFIG_IPADDR 192.168.0.105 -#define CONFIG_GATEWAYIP0.0.0.0 +#define CONFIG_GATEWAYIP192.168.0.1 #define CONFIG_NETMASK 255.255.255.0 +#endif + I think this should be removed. There is really no good reason to add network configuration at all to the board config file (with the exception of the 2 or 3 boards which actually boot from real ROM). No problem. I'll remove and resend. As a compromise between removal and keeping the useful information for developers who are doing early bringup on similar boards, I have applied this patch, and replaced the above with: /* You can compile in a MAC address and your custom net settings by using * the following syntax. Your board should be marked with the assigned * MAC addresses directly on it. * * #define CONFIG_ETHADDR de:ad:be:ef:00:00 * #define CONFIG_ETH1ADDR fa:ke:ad:dr:es:s! * #define CONFIG_SERVERIP server ip * #define CONFIG_IPADDRboard ip * #define CONFIG_GATEWAYIP gateway ip * #define CONFIG_NETMASK your netmask */ Wolfgang, if you still object, I can totally remove it before you pull (git rebase --interactive is a wonderful thing). I also corrected some whitespace issues where comments trailed off the end of the line for no good reason. Thanks, Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 2/7] sbc8560: properly set cs0_bnds for 512MB
On Fri, Jul 11, 2008 at 2:33 PM, Paul Gortmaker [EMAIL PROTECTED] wrote: The sbc8560 board ships with 512MB of memory installed, but the current cs0_bnds is hard coded for 256MB. Set the value based on CFG_SDRAM_SIZE. Signed-off-by: Paul Gortmaker [EMAIL PROTECTED] Applied, thanks Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 4/7] sbc8560: add in ft_board_setup()
On Fri, Jul 11, 2008 at 2:33 PM, Paul Gortmaker [EMAIL PROTECTED] wrote: Add in for the sbc8560, the ft_board_setup() routine, based on what is in use for the Freescale MPC8560ADS board. Signed-off-by: Paul Gortmaker [EMAIL PROTECTED] Applied, thanks Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH 6/7] sbc8560: enable CONFIG_OF_LIBFDT by default
On Fri, Jul 11, 2008 at 2:33 PM, Paul Gortmaker [EMAIL PROTECTED] wrote: Make the default build for the sbc8560 board be powerpc capable with libfdt support. Signed-off-by: Paul Gortmaker [EMAIL PROTECTED] Applied, thanks Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [REPOST][PATCH 1/4] 85xx: Cleanup L2 cache size detection
On Mon, Jul 14, 2008 at 2:07 PM, Kumar Gala [EMAIL PROTECTED] wrote: The L2 size detection code was a bit confusing and we kept having to add code to it to handle new processors. Change the sense of detection so we look for the older processors that aren't changing. Also added support for 1M cache size on 8572. Signed-off-by: Kumar Gala [EMAIL PROTECTED] Applied, thanks Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [REPOST][PATCH 2/4] MPC8544DS: Report board id, board version and fpga version.
On Mon, Jul 14, 2008 at 2:07 PM, Kumar Gala [EMAIL PROTECTED] wrote: Signed-off-by: Kumar Gala [EMAIL PROTECTED] Applied, thanks Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [REPOST][PATCH 4/4] MPC8544DS: Add ATI Video card support
On Mon, Jul 14, 2008 at 2:07 PM, Kumar Gala [EMAIL PROTECTED] wrote: Add support for using a PCIe ATI Video card on PCIe2. Signed-off-by: Kumar Gala [EMAIL PROTECTED] Applied, thanks Andy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] Please pull u-boot-mpc85xx.git
are available in the git repository at: git://www.denx.de/git/u-boot-mpc85xx.git master Andrew Klossner (1): Change the temp map to ROM to align addresses to page size. Andy Fleming (4): Remove LBC_CACHE_BASE from 8544 DS Fix indentation for default boot environment variables Remove fake flash bank from 8544 DS Clean up INIT_RAM options Kim Phillips (2): fdt: add crypto node handling for MPC8{3, 5}xxE processors mpc85xx: use IS_E_PROCESSOR macro Kumar Gala (4): 85xx: Cleanup L2 cache size detection MPC8544DS: Report board id, board version and fpga version. 85xx: Add some L1/L2 SPR register definitions MPC8544DS: Add ATI Video card support Paul Gortmaker (7): 8xxx-fdt: set ns16550 clock from CFG_NS16550_CLK, not bi_busfreq sbc8560: proper definitions for TSEC. sbc8560: properly set cs0_bnds for 512MB sbc8560: define eth0 and eth1 instead of eth1 and eth2 sbc8560: add in ft_board_setup() sbc8560: add default fdt values sbc8560: enable CONFIG_OF_LIBFDT by default board/freescale/mpc8544ds/law.c |2 +- board/freescale/mpc8544ds/mpc8544ds.c |5 +- board/freescale/mpc8544ds/tlb.c | 12 +--- board/freescale/mpc8544ds/u-boot.lds |1 + board/sbc8560/sbc8560.c | 32 common/fdt_support.c | 87 ++ cpu/mpc83xx/fdt.c | 20 +- cpu/mpc85xx/cpu.c |2 +- cpu/mpc85xx/cpu_init.c| 47 - cpu/mpc85xx/fdt.c |7 ++- cpu/mpc85xx/start.S |9 ++- cpu/mpc86xx/fdt.c |2 +- include/asm-ppc/processor.h | 29 include/configs/MPC8544DS.h | 52 -- include/configs/MPC8560ADS.h | 38 +- include/configs/sbc8560.h | 128 ++-- include/fdt_support.h |6 ++ include/mpc83xx.h |7 ++- 18 files changed, 366 insertions(+), 120 deletions(-) - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] Pull request: u-boot-sh
The following changes since commit 348753d416cd2c9e7ec6520a544c8f33cf02a560: Kumar Gala (1): Fix some more printf() format problems. are available in the git repository at: git://git.denx.de/u-boot-sh.git master Nobuhiro Iwamatsu (1): pci: sh: Add pci_skip_dev and pci_print_dev function drivers/pci/pci_sh4.c | 12 - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users