March 2009 - U-Boot

[U-Boot] [PATCH] ARM: fix warning: 'print_eth' defined but not used
by Wolfgang Denk 29 Mar '09

29 Mar '09

This warning got issued for all ARM systems that don't have CONFIG_CMD_NET enabled. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- common/cmd_bdinfo.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index 700314b..b230924 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -31,7 +31,9 @@ DECLARE_GLOBAL_DATA_PTR; static void print_num(const char *, ulong); +#if !defined(CONFIG_ARM) || defined(CONFIG_CMD_NET) static void print_eth(int idx); +#endif #ifndef CONFIG_ARM /* PowerPC and other */ static void print_lnum(const char *, u64); @@ -347,6 +349,7 @@ static void print_num(const char *name, ulong value) printf ("%-12s= 0x%08lX\n", name, value); } +#if !defined(CONFIG_ARM) || defined(CONFIG_CMD_NET) static void print_eth(int idx) { char name[10], *val; @@ -359,6 +362,7 @@ static void print_eth(int idx) val = "(not set)"; printf("%-12s= %s\n", name, val); } +#endif #ifndef CONFIG_ARM static void print_lnum(const char *name, u64 value) -- 1.6.0.6

1 0

[U-Boot] [PATCH] Fix implicit declaration of function 'eth_[gs]etenv_enetaddr'
by Wolfgang Denk 29 Mar '09

29 Mar '09

...and some other compile warnings. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/pcs440ep/pcs440ep.c | 10 +++++----- board/sandburst/karef/karef.c | 4 ++++ board/sandburst/metrobox/metrobox.c | 4 ++++ board/xpedite1k/xpedite1k.c | 1 + common/lynxkdi.c | 1 + 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c index 2727214..9cc3f5b 100644 --- a/board/pcs440ep/pcs440ep.c +++ b/board/pcs440ep/pcs440ep.c @@ -31,6 +31,7 @@ #include <status_led.h> #include <sha1.h> #include <asm/io.h> +#include <net.h> DECLARE_GLOBAL_DATA_PTR; @@ -186,8 +187,7 @@ static void load_ethaddr(void) { int ok_ethaddr, ok_eth1addr; int ret; - char buf[EEPROM_LEN]; - char mac[32]; + uchar buf[EEPROM_LEN]; char *use_eeprom; u16 checksumcrc16 = 0; @@ -200,14 +200,14 @@ static void load_ethaddr(void) /* read the MACs from EEprom */ status_led_set (0, STATUS_LED_ON); status_led_set (1, STATUS_LED_ON); - ret = eeprom_read (CONFIG_SYS_I2C_EEPROM_ADDR, 0, (uchar *)buf, EEPROM_LEN); + ret = eeprom_read (CONFIG_SYS_I2C_EEPROM_ADDR, 0, buf, EEPROM_LEN); if (ret == 0) { - checksumcrc16 = cyg_crc16 ((uchar *)buf, EEPROM_LEN - 2); + checksumcrc16 = cyg_crc16 (buf, EEPROM_LEN - 2); /* check, if the EEprom is programmed: * - The Prefix(Byte 0,1,2) is equal to "ATR" * - The checksum, stored in the last 2 Bytes, is correct */ - if ((strncmp (buf,"ATR",3) != 0) || + if ((strncmp ((char *)buf,"ATR",3) != 0) || ((checksumcrc16 >> 8) != buf[EEPROM_LEN - 2]) || ((checksumcrc16 & 0xff) != buf[EEPROM_LEN - 1])) { /* EEprom is not programmed */ diff --git a/board/sandburst/karef/karef.c b/board/sandburst/karef/karef.c index 1ad1ae2..b8ae68f 100644 --- a/board/sandburst/karef/karef.c +++ b/board/sandburst/karef/karef.c @@ -33,6 +33,10 @@ #include <i2c.h> #include "../common/sb_common.h" #include "../common/ppc440gx_i2c.h" +#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) || \ + defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) +#include <net.h> +#endif void fpga_init (void); diff --git a/board/sandburst/metrobox/metrobox.c b/board/sandburst/metrobox/metrobox.c index bd6be3d..fc136c8 100644 --- a/board/sandburst/metrobox/metrobox.c +++ b/board/sandburst/metrobox/metrobox.c @@ -32,6 +32,10 @@ #include <i2c.h> #include "../common/ppc440gx_i2c.h" #include "../common/sb_common.h" +#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) || \ + defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) +#include <net.h> +#endif void fpga_init (void); diff --git a/board/xpedite1k/xpedite1k.c b/board/xpedite1k/xpedite1k.c index 92dc628..044aeb9 100644 --- a/board/xpedite1k/xpedite1k.c +++ b/board/xpedite1k/xpedite1k.c @@ -25,6 +25,7 @@ #include <asm/processor.h> #include <spd_sdram.h> #include <i2c.h> +#include <net.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/common/lynxkdi.c b/common/lynxkdi.c index 17b0607..b23135b 100644 --- a/common/lynxkdi.c +++ b/common/lynxkdi.c @@ -16,6 +16,7 @@ #include <common.h> #include <asm/processor.h> #include <image.h> +#include <net.h> #include <lynxkdi.h> -- 1.6.0.6

1 0

[U-Boot] [PATCH] cs8900 compile fix
by Ladislav Michl 29 Mar '09

29 Mar '09

cs8900.c: In function 'eth_init': cs8900.c:164: warning: passing argument 2 of 'eth_getenv_enetaddr' from incompatible pointer type cs8900.c:165: error: invalid operands to binary << cs8900.c:166: error: invalid operands to binary << cs8900.c:167: error: invalid operands to binary << Signed-off-by: Ladislav Michl <ladis(a)linux-mips.org> diff --git a/drivers/net/cs8900.c b/drivers/net/cs8900.c index 0557fcd..5e2b3b0 100644 --- a/drivers/net/cs8900.c +++ b/drivers/net/cs8900.c @@ -151,7 +151,7 @@ void eth_halt (void) int eth_init (bd_t * bd) { - uchar *enetaddr[6]; + uchar enetaddr[6]; /* verify chip id */ if (get_reg_init_bus (PP_ChipID) != 0x630e) {

3 3

[U-Boot] [PATCH] Add imls utility command
by Marco 28 Mar '09

28 Mar '09

This patch adds, under tools folder, a new command called imls. It's goal is the same of UBoot's imls but it has to be used as Linux shell command. It reads from raw mtd partition and prints the list of the stored images. Signed-off-by: Marco Stornelli <marco.stornelli(a)gmail.com> --- diff -uprN u-boot-2009.03-orig/tools/imls.c u-boot-2009.03/tools/imls.c --- u-boot-2009.03-orig/tools/imls.c 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-2009.03/tools/imls.c 2009-03-28 18:55:49.000000000 +0100 @@ -0,0 +1,213 @@ +/* + * (C) Copyright 2009 Marco Stornelli + * + * 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 "imls.h" + +extern unsigned long crc32 (unsigned long crc, const char *buf, unsigned int len); +static void usage (void); +static int image_verify_header (char *ptr, int fd); + +char *cmdname; +char *devicefile; + +unsigned int sectorcount = 0; +int sflag = 0; +unsigned int sectoroffset = 0; +unsigned int sectorsize = 0; +int cflag = 0; + +int main (int argc, char **argv) +{ + int fd = -1, err = 0, readbyte = 0, j, len; + uint32_t mtdsize, dim; + struct mtd_info_user mtdinfo; + char *buf; + int found = 0; + + cmdname = *argv; + + while (--argc > 0 && **++argv == '-') { + while (*++*argv) { + switch (**argv) { + case 's': + if (--argc <= 0) + usage (); + sectorcount = (unsigned int)atoi(*++argv); + sflag = 1; + goto NXTARG; + case 'o': + if (--argc <= 0) + usage (); + sectoroffset = (unsigned int)atoi(*++argv); + goto NXTARG; + + case 'c': + if (--argc <= 0) + usage (); + sectorsize = (unsigned int)atoi(*++argv); + cflag = 1; + goto NXTARG; + default: + usage (); + } + } +NXTARG: ; + } + + if ((argc != 1) || cflag == 0 || sflag == 0) + usage(); + + devicefile = *argv; + + fd = open(devicefile,O_RDONLY); + if(fd < 0){ + fprintf (stderr, "%s: Can't open %s: %s\n", + cmdname, devicefile, strerror(errno)); + exit (EXIT_FAILURE); + } + + err = ioctl(fd, MEMGETINFO, &mtdinfo); + if (err < 0) { + fprintf(stderr, "%s: Cannot get MTD information: %s\n",cmdname,strerror(errno)); + exit (EXIT_FAILURE); + } + + mtdsize = mtdinfo.size; + + if(sectorsize*sectorcount != mtdsize){ + fprintf(stderr, "%s: Partition size (%d) incompatible with sector size and count\n",cmdname,mtdsize); + exit (EXIT_FAILURE); + } + + if(sectorsize*sectoroffset >= mtdsize){ + fprintf(stderr, "%s: Partition size (%d) incompatible with sector offset given\n",cmdname,mtdsize); + exit (EXIT_FAILURE); + } + + if(sectoroffset > sectorcount - 1){ + fprintf(stderr, "%s: Sector offset cannot be grater than sector count minus one\n",cmdname); + exit (EXIT_FAILURE); + } + + dim = image_get_header_size(); + + buf = malloc(sizeof(char)*dim); + if(!buf){ + fprintf (stderr, "%s: Can't allocate memory: %s\n", + cmdname, strerror(errno)); + exit (EXIT_FAILURE); + } + + if(sectoroffset != 0) + lseek(fd,sectoroffset*sectorsize,SEEK_SET); + + printf("Searching....\n"); + + for (j = sectoroffset; j < sectorcount; ++j) { + + readbyte=read(fd,buf,dim); + if(readbyte != dim){ + fprintf(stderr, "%s: Can't read from device: %s\n", + cmdname, strerror(errno)); + exit (EXIT_FAILURE); + } + + if (fdt_check_header(buf)) { + /* old-style image */ + if(image_verify_header(buf, fd)) { + found = 1; + image_print_contents((image_header_t *)buf); + } + } else { + /* FIT image */ + fit_print_contents(buf); + } + + } + + free(buf); + + close(fd); + + if(!found) + printf("No images found\n"); + + exit (EXIT_SUCCESS); +} + +void +usage () +{ + fprintf (stderr, "Usage:\n" + " %s [-o offset] -s count -c size \n" + " -o ==> number of sectors to use as offset\n" + " -s ==> number of sectors\n" + " -c ==> size of sectors\n", + cmdname); + + exit (EXIT_FAILURE); +} + +static int image_verify_header(char *ptr, int fd) +{ + int len, n; + char *data; + uint32_t checksum; + image_header_t *hdr = (image_header_t *)ptr; + + if (ntohl(hdr->ih_magic) != IH_MAGIC) { + return 0; + } + + data = (char *)hdr; + len = sizeof(image_header_t); + + checksum = ntohl(hdr->ih_hcrc); + hdr->ih_hcrc = htonl(0); /* clear for re-calculation */ + + if (crc32 (0, data, len) != checksum) { + fprintf (stderr, + "%s: Maybe image found but it has bad header checksum!\n", + cmdname); + return 0; + } + + len = ntohl(hdr->ih_size); + data = malloc(len*sizeof(char)); + + n = read(fd, data, len); + if (n != len) { + fprintf (stderr, + "%s: Error while reading: %s\n", + cmdname, strerror(errno)); + exit(EXIT_FAILURE); + } + + if (crc32 (0, data, len) != ntohl(hdr->ih_dcrc)) { + fprintf (stderr, + "%s: Maybe image found but it has corrupted data!\n", + cmdname); + return 0; + } + + free(data); + + return 1; +} + diff -uprN u-boot-2009.03-orig/tools/imls.h u-boot-2009.03/tools/imls.h --- u-boot-2009.03-orig/tools/imls.h 1970-01-01 01:00:00.000000000 +0100 +++ u-boot-2009.03/tools/imls.h 2009-03-28 18:45:18.000000000 +0100 @@ -0,0 +1,45 @@ +/* + * (C) Copyright 2009 Marco Stornelli + * + * 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 <errno.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <stddef.h> +#include <string.h> +#include <sys/types.h> +#include <sys/ioctl.h> +#include <sys/stat.h> +#include <unistd.h> + +#ifdef MTD_OLD +# include <stdint.h> +# include <linux/mtd/mtd.h> +#else +# define __user /* nothing */ +# include <mtd/mtd-user.h> +#endif + +#ifndef __WIN32__ +#include <netinet/in.h> /* for host / network byte order conversions */ +#endif + +#include <sha1.h> +#include "fdt_host.h" +#include <image.h> diff -uprN u-boot-2009.03-orig/tools/Makefile u-boot-2009.03/tools/Makefile --- u-boot-2009.03-orig/tools/Makefile 2009-03-21 22:04:41.000000000 +0100 +++ u-boot-2009.03/tools/Makefile 2009-03-28 18:47:38.000000000 +0100 @@ -21,10 +21,10 @@ # MA 02111-1307 USA # -BIN_FILES = img2srec$(SFX) mkimage$(SFX) envcrc$(SFX) ubsha1$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX) +BIN_FILES = img2srec$(SFX) mkimage$(SFX) imls$(SFX) envcrc$(SFX) ubsha1$(SFX) gen_eth_addr$(SFX) bmp_logo$(SFX) OBJ_LINKS = env_embedded.o crc32.o md5.o sha1.o image.o -OBJ_FILES = img2srec.o mkimage.o envcrc.o ubsha1.o gen_eth_addr.o bmp_logo.o +OBJ_FILES = img2srec.o mkimage.o imls.o envcrc.o ubsha1.o gen_eth_addr.o bmp_logo.o ifeq ($(ARCH),mips) BIN_FILES += inca-swap-bytes$(SFX) @@ -151,6 +151,10 @@ $(obj)mkimage$(SFX): $(obj)mkimage.o $(o $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^ $(STRIP) $@ +$(obj)imls$(SFX): $(obj)imls.o $(obj)crc32.o $(obj)image.o $(obj)md5.o $(obj)sha1.o $(LIBFDT_OBJ_FILES) + $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^ + $(STRIP) $@ + $(obj)ncb$(SFX): $(obj)ncb.o $(CC) $(CFLAGS) $(HOST_LDFLAGS) -o $@ $^ $(STRIP) $@ @@ -196,6 +200,9 @@ $(obj)image.o: $(obj)image.c $(obj)mkimage.o: $(src)mkimage.c $(CC) -g $(FIT_CFLAGS) -c -o $@ $< +$(obj)imls.o: $(src)imls.c + $(CC) -g $(FIT_CFLAGS) -c -o $@ $< + $(obj)ncb.o: $(src)ncb.c $(CC) -g $(CFLAGS) -c -o $@ $<

1 0

[U-Boot] Final Email Notification
by once112009 28 Mar '09

28 Mar '09

We are pleased to inform you of the result of the Loteria International programs held on the 24th March 2009. Your e-mail address attached to the Ticket number.THGFGS.6777,75534.442.Lucky number.TGHDN.4532,7889,3666.You are therefore been approved for a sum of 870,812.79 in 3rd class of the draws. For prize claiming,Conact our claim agent to file for your claim.MR.Martin Agustin,TEL:+34-634 141 812,EMAIL TO: golfortunetrust(a)aim.com NAME:........................... ADDRESS:.................... NATIONALITY:...................... SEX:............................. AGE:............................ PHONE/MOBILE:.......................... FAX:................................... OCCUPATION:............................ Batch Number:BDJMKK/56477-38874 DATE:24th Of March 2009. Management, Loteria Naccional Program.

1 0

[U-Boot] [PATCH v2 1/3] MPC85xx: Add MPC8569 CPU support
by Haiying Wang 27 Mar '09

27 Mar '09

There is a workaround for MPC8569 CPU Errata, which needs to set Bit 13 of LBCR in 4K bootpage. We setup a temp TLB for eLBC controller in bootpage, then invalidate it after LBCR bit 13 is set. Signed-off-by: Haiying Wang <Haiying.Wang(a)freescale.com> --- cpu/mpc85xx/Makefile | 1 + cpu/mpc85xx/cpu.c | 2 + cpu/mpc85xx/start.S | 49 ++++++++++++++++++++++++++++++++++++++++++ drivers/misc/fsl_law.c | 2 +- include/asm-ppc/immap_85xx.h | 13 ++++++++++- include/asm-ppc/immap_qe.h | 8 ++++-- include/asm-ppc/processor.h | 2 + 7 files changed, 72 insertions(+), 5 deletions(-) diff --git a/cpu/mpc85xx/Makefile b/cpu/mpc85xx/Makefile index 99d88a8..8809302 100644 --- a/cpu/mpc85xx/Makefile +++ b/cpu/mpc85xx/Makefile @@ -49,6 +49,7 @@ COBJS-$(CONFIG_MPC8544) += ddr-gen2.o COBJS-$(CONFIG_MPC8572) += ddr-gen3.o COBJS-$(CONFIG_MPC8536) += ddr-gen3.o COBJS-$(CONFIG_P2020) += ddr-gen3.o +COBJS-$(CONFIG_MPC8569) += ddr-gen3.o COBJS-$(CONFIG_MPC8536) += mpc8536_serdes.o COBJS = traps.o cpu.o cpu_init.o speed.o interrupts.o tlb.o \ diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c index 5b72fe5..ef976a4 100644 --- a/cpu/mpc85xx/cpu.c +++ b/cpu/mpc85xx/cpu.c @@ -61,6 +61,8 @@ struct cpu_type cpu_type_list [] = { CPU_TYPE_ENTRY(8567, 8567_E), CPU_TYPE_ENTRY(8568, 8568), CPU_TYPE_ENTRY(8568, 8568_E), + CPU_TYPE_ENTRY(8569, 8569), + CPU_TYPE_ENTRY(8569, 8569_E), CPU_TYPE_ENTRY(8572, 8572), CPU_TYPE_ENTRY(8572, 8572_E), CPU_TYPE_ENTRY(P2020, P2020), diff --git a/cpu/mpc85xx/start.S b/cpu/mpc85xx/start.S index 80f9677..0424b2b 100644 --- a/cpu/mpc85xx/start.S +++ b/cpu/mpc85xx/start.S @@ -184,6 +184,55 @@ _start_e500: mtspr DBCR0,r0 #endif +#ifdef CONFIG_MPC8569 +#define CONFIG_SYS_LBC_ADDR (CONFIG_SYS_CCSRBAR_DEFAULT + 0x5000) +#define CONFIG_SYS_LBCR_ADDR (CONFIG_SYS_LBC_ADDR + 0xd0) + + /* MPC8569 Rev.0 silcon needs to set bit 13 of LBCR to allow elBC to + * use address space which is more than 12bits, and it must be done in + * the 4K boot page. So we set this bit here. + */ + + /* create a temp mapping TLB0[0] for LBCR */ + lis r6,FSL_BOOKE_MAS0(0, 0, 0)@h + ori r6,r6,FSL_BOOKE_MAS0(0, 0, 0)@l + + lis r7,FSL_BOOKE_MAS1(1, 0, 0, 0, BOOKE_PAGESZ_4K)@h + ori r7,r7,FSL_BOOKE_MAS1(1, 0, 0, 0, BOOKE_PAGESZ_4K)@l + + lis r8,FSL_BOOKE_MAS2(CONFIG_SYS_LBC_ADDR, MAS2_I|MAS2_G)@h + ori r8,r8,FSL_BOOKE_MAS2(CONFIG_SYS_LBC_ADDR, MAS2_I|MAS2_G)@l + + lis r9,FSL_BOOKE_MAS3(CONFIG_SYS_LBC_ADDR, 0, + (MAS3_SX|MAS3_SW|MAS3_SR))@h + ori r9,r9,FSL_BOOKE_MAS3(CONFIG_SYS_LBC_ADDR, 0, + (MAS3_SX|MAS3_SW|MAS3_SR))@l + + mtspr MAS0,r6 + mtspr MAS1,r7 + mtspr MAS2,r8 + mtspr MAS3,r9 + isync + msync + tlbwe + + /* Set LBCR register */ + lis r4,CONFIG_SYS_LBCR_ADDR@h + ori r4,r4,CONFIG_SYS_LBCR_ADDR@l + + lis r5,CONFIG_SYS_LBC_LBCR@h + ori r5,r5,CONFIG_SYS_LBC_LBCR@l + stw r5,0(r4) + isync + + /* invalidate this temp TLB */ + lis r4,CONFIG_SYS_LBC_ADDR@h + ori r4,r4,CONFIG_SYS_LBC_ADDR@l + tlbivax 0,r4 + isync + +#endif /* CONFIG_MPC8569 */ + /* create a temp mapping in AS=1 to the 4M boot window */ lis r6,FSL_BOOKE_MAS0(1, 15, 0)@h ori r6,r6,FSL_BOOKE_MAS0(1, 15, 0)@l diff --git a/drivers/misc/fsl_law.c b/drivers/misc/fsl_law.c index 58340c1..be43a3e 100644 --- a/drivers/misc/fsl_law.c +++ b/drivers/misc/fsl_law.c @@ -35,7 +35,7 @@ DECLARE_GLOBAL_DATA_PTR; defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555) #define FSL_HW_NUM_LAWS 8 #elif defined(CONFIG_MPC8548) || defined(CONFIG_MPC8544) || \ - defined(CONFIG_MPC8568) || \ + defined(CONFIG_MPC8568) || defined(CONFIG_MPC8569) || \ defined(CONFIG_MPC8641) || defined(CONFIG_MPC8610) #define FSL_HW_NUM_LAWS 10 #elif defined(CONFIG_MPC8536) || defined(CONFIG_MPC8572) || \ diff --git a/include/asm-ppc/immap_85xx.h b/include/asm-ppc/immap_85xx.h index 094fb9c..0810b8e 100644 --- a/include/asm-ppc/immap_85xx.h +++ b/include/asm-ppc/immap_85xx.h @@ -1609,8 +1609,19 @@ typedef struct ccsr_gur { char res2[12]; uint gpiocr; /* 0xe0030 - GPIO control register */ char res3[12]; +#if defined(CONFIG_MPC8569) + uint plppar1; + /* 0xe0040 - Platform port pin assignment register 1 */ + uint plppar2; + /* 0xe0044 - Platform port pin assignment register 2 */ + uint plpdir1; + /* 0xe0048 - Platform port pin direction register 1 */ + uint plpdir2; + /* 0xe004c - Platform port pin direction register 2 */ +#else uint gpoutdr; /* 0xe0040 - General-purpose output data register */ char res4[12]; +#endif uint gpindr; /* 0xe0050 - General-purpose input data register */ char res5[12]; uint pmuxcr; /* 0xe0060 - Alternate function signal multiplex control */ @@ -1651,7 +1662,7 @@ typedef struct ccsr_gur { uint svr; /* 0xe00a4 - System version register */ char res10a[8]; uint rstcr; /* 0xe00b0 - Reset control register */ -#ifdef CONFIG_MPC8568 +#if defined(CONFIG_MPC8568)||defined(CONFIG_MPC8569) char res10b[76]; par_io_t qe_par_io[7]; /* 0xe0100 - 0xe01bf */ char res10c[3136]; diff --git a/include/asm-ppc/immap_qe.h b/include/asm-ppc/immap_qe.h index 39da377..66a4735 100644 --- a/include/asm-ppc/immap_qe.h +++ b/include/asm-ppc/immap_qe.h @@ -20,7 +20,9 @@ typedef struct qe_iram { u32 iadd; /* I-RAM Address Register */ u32 idata; /* I-RAM Data Register */ - u8 res0[0x78]; + u8 res0[0x4]; + u32 iready; + u8 res1[0x70]; } __attribute__ ((packed)) qe_iram_t; /* QE Interrupt Controller @@ -580,7 +582,7 @@ typedef struct qe_immap { u8 res14[0x300]; u8 res15[0x3A00]; u8 res16[0x8000]; /* 0x108000 - 0x110000 */ -#if defined(CONFIG_MPC8568) +#if defined(CONFIG_MPC8568)||defined(CONFIG_MPC8569) u8 muram[0x10000]; /* 0x1_0000 - 0x2_0000 Multi-user RAM */ u8 res17[0x20000]; /* 0x2_0000 - 0x4_0000 */ #else @@ -592,7 +594,7 @@ typedef struct qe_immap { extern qe_map_t *qe_immr; -#if defined(CONFIG_MPC8568) +#if defined(CONFIG_MPC8568) || defined(CONFIG_MPC8569) #define QE_MURAM_SIZE 0x10000UL #elif defined(CONFIG_MPC8360) #define QE_MURAM_SIZE 0xc000UL diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 5b29de0..83e3581 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -955,6 +955,8 @@ #define SVR_8567_E 0x807E00 #define SVR_8568 0x807500 #define SVR_8568_E 0x807D00 +#define SVR_8569 0x808000 +#define SVR_8569_E 0x808800 #define SVR_8572 0x80E000 #define SVR_8572_E 0x80E800 #define SVR_P2020 0x80E200 -- 1.6.0.2

1 1

[U-Boot] [PATCH v2 0/7] Update for inka4x0 plus some new features
by Detlev Zundel 27 Mar '09

27 Mar '09

This patchset contains updates for the ink4x0 platform. Namely it adds hardware diagnostic funtions and an RTC driver. For a nice integration by using private command tables, do_help is extended to support this scenario also. To successfully convert all the pointer access to accessor macros, a bunch of new defines is also needed for the 5200 cpu. Changes from v1: Addresses comments from ML. Specifically: - Moved ns16650 defines to proper include file. - Used structures from this header file to access UARTs - this nicely eliminates serial_{in,out}. - Convert inka_diag.c pointer accesses to accessor macros. - Move variable declarations to start of functions. A diff of the "before" and "after" branches will be posted seperately for easier inspection. Detlev Zundel (7): command.c: Expose the core of do_help as _do_help to the rest of u-boot. mpc5xxx: Add structure definition for several more register blocks. drivers/twserial: Add protocol driver for "three wire serial" interface. rtc: add support for 4543 RTC (manufactured by e.g. EPSON) inka4x0: Add hardware diagnosis functions for inka4x0 inka4x0: Add hardware diagnosis and RTC in configuration. inka4x0: Use proper accessor macros for memory mapped registers. Makefile | 3 +- board/inka4x0/Makefile | 4 +- board/inka4x0/inka4x0.c | 171 +++++++++----- board/inka4x0/inkadiag.c | 514 +++++++++++++++++++++++++++++++++++++++++++ common/command.c | 20 +- drivers/rtc/Makefile | 1 + drivers/rtc/rtc4543.c | 118 ++++++++++ drivers/twserial/Makefile | 46 ++++ drivers/twserial/soft_tws.c | 110 +++++++++ include/command.h | 4 +- include/configs/inka4x0.h | 91 +++++++- include/mpc5xxx.h | 124 +++++++++++ include/ns16550.h | 11 + include/rtc.h | 4 + include/tws.h | 47 ++++ 15 files changed, 1190 insertions(+), 78 deletions(-) create mode 100644 board/inka4x0/inkadiag.c create mode 100644 drivers/rtc/rtc4543.c create mode 100644 drivers/twserial/Makefile create mode 100644 drivers/twserial/soft_tws.c create mode 100644 include/tws.h

5 22

[U-Boot] [PATCH v1 0/7] Update for inka4x0 plus some new features
by Detlev Zundel 27 Mar '09

27 Mar '09

This patchset contains updates for the ink4x0 platform. Namely it adds hardware diagnostic funtions and an RTC driver. For a nice integration by using private command tables, do_help is extended to support this scenario also. To successfully convert all the pointer access to accessor macros, a bunch of new defines is also needed for the 5200 cpu. Andreas Pfefferle (1): rtc: add support for 4543 RTC (manufactured by e.g. EPSON) Detlev Zundel (6): command.c: Expose the core of do_help as _do_help to the rest of u-boot. mpc5xxx: Add structure definition for several more register blocks. drivers/twserial: Add protocol driver for "three wire serial" interface. inka4x0: Add hardware diagnosis functions for inka4x0 inka4x0: Add hardware diagnosis and RTC in configuration. inka4x0: Use proper accessor macros for memory mapped registers. Makefile | 3 +- board/inka4x0/Makefile | 4 +- board/inka4x0/inka4x0.c | 162 ++++++++----- board/inka4x0/inkadiag.c | 541 +++++++++++++++++++++++++++++++++++++++++++ common/command.c | 20 +- drivers/rtc/Makefile | 1 + drivers/rtc/rtc4543.c | 118 ++++++++++ drivers/twserial/Makefile | 46 ++++ drivers/twserial/soft_tws.c | 110 +++++++++ include/command.h | 4 +- include/configs/inka4x0.h | 91 +++++++- include/mpc5xxx.h | 124 ++++++++++ include/rtc.h | 4 + include/tws.h | 46 ++++ 14 files changed, 1196 insertions(+), 78 deletions(-) create mode 100644 board/inka4x0/inkadiag.c create mode 100644 drivers/rtc/rtc4543.c create mode 100644 drivers/twserial/Makefile create mode 100644 drivers/twserial/soft_tws.c create mode 100644 include/tws.h

5 28

[U-Boot] [PATCH] MAINTAINERS: Keep list sorted.
by Detlev Zundel 27 Mar '09

27 Mar '09

Signed-off-by: Detlev Zundel <dzu(a)denx.de> --- MAINTAINERS | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index ce25c1b..6f3e836 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -219,6 +219,10 @@ Larry Johnson <lrj(a)acm.org> korat PPC440EPx +Feng Kan <fkan(a)amcc.com> + + redwood PPC4xx + Brad Kemp <Brad.Kemp(a)seranoa.com> ppmc8260 MPC8260 @@ -448,9 +452,6 @@ John Zhan <zhanz(a)sinovee.com> svm_sc8xx MPC8xx -Feng Kan <fkan(a)amcc.com> - - redwood PPC4xx ------------------------------------------------------------------------- Unknown / orphaned boards: @@ -509,6 +510,9 @@ George G. Davis <gdavis(a)mvista.com> assabet SA1100 gcplus SA1100 +Wolfgang Denk <wd(a)denx.de> + qong i.MX31 + Thomas Elste <info(a)elste.org> modnet50 ARM720T (NET+50) @@ -656,9 +660,6 @@ Sergey Lapin <slapin(a)ossfans.org> afeb9260 ARM926EJS (AT91SAM9260 SoC) -Wolfgang Denk <wd(a)denx.de> - qong i.MX31 - ------------------------------------------------------------------------- Unknown / orphaned boards: -- 1.6.0.6

2 3

[U-Boot] [PATCH] karef/metrobox/xpedite1k: fix eth_setenv_enetaddr typos
by Mike Frysinger 27 Mar '09

27 Mar '09

The function is called "eth_setenv_enetaddr", not "eth_putenv_enetaddr". Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> CC: Ben Warren <biggerbadderben(a)gmail.com> --- board/sandburst/karef/karef.c | 8 ++++---- board/sandburst/metrobox/metrobox.c | 8 ++++---- board/xpedite1k/xpedite1k.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/board/sandburst/karef/karef.c b/board/sandburst/karef/karef.c index 55310d7..1ad1ae2 100644 --- a/board/sandburst/karef/karef.c +++ b/board/sandburst/karef/karef.c @@ -412,28 +412,28 @@ int misc_init_r (void) #ifdef CONFIG_HAS_ETH0 if (!eth_getenv_enetaddr("ethaddr", enetaddr)) { board_get_enetaddr(0, enetaddr); - eth_putenv_enetaddr("ethaddr", enetaddr); + eth_setenv_enetaddr("ethaddr", enetaddr); } #endif #ifdef CONFIG_HAS_ETH1 if (!eth_getenv_enetaddr("eth1addr", enetaddr)) { board_get_enetaddr(1, enetaddr); - eth_putenv_enetaddr("eth1addr", enetaddr); + eth_setenv_enetaddr("eth1addr", enetaddr); } #endif #ifdef CONFIG_HAS_ETH2 if (!eth_getenv_enetaddr("eth2addr", enetaddr)) { board_get_enetaddr(2, enetaddr); - eth_putenv_enetaddr("eth2addr", enetaddr); + eth_setenv_enetaddr("eth2addr", enetaddr); } #endif #ifdef CONFIG_HAS_ETH3 if (!eth_getenv_enetaddr("eth3addr", enetaddr)) { board_get_enetaddr(3, enetaddr); - eth_putenv_enetaddr("eth3addr", enetaddr); + eth_setenv_enetaddr("eth3addr", enetaddr); } #endif diff --git a/board/sandburst/metrobox/metrobox.c b/board/sandburst/metrobox/metrobox.c index 8bb8c02..bd6be3d 100644 --- a/board/sandburst/metrobox/metrobox.c +++ b/board/sandburst/metrobox/metrobox.c @@ -383,28 +383,28 @@ int misc_init_r (void) #ifdef CONFIG_HAS_ETH0 if (!eth_getenv_enetaddr("ethaddr", enetaddr)) { board_get_enetaddr(0, enetaddr); - eth_putenv_enetaddr("ethaddr", enetaddr); + eth_setenv_enetaddr("ethaddr", enetaddr); } #endif #ifdef CONFIG_HAS_ETH1 if (!eth_getenv_enetaddr("eth1addr", enetaddr)) { board_get_enetaddr(1, enetaddr); - eth_putenv_enetaddr("eth1addr", enetaddr); + eth_setenv_enetaddr("eth1addr", enetaddr); } #endif #ifdef CONFIG_HAS_ETH2 if (!eth_getenv_enetaddr("eth2addr", enetaddr)) { board_get_enetaddr(2, enetaddr); - eth_putenv_enetaddr("eth2addr", enetaddr); + eth_setenv_enetaddr("eth2addr", enetaddr); } #endif #ifdef CONFIG_HAS_ETH3 if (!eth_getenv_enetaddr("eth3addr", enetaddr)) { board_get_enetaddr(3, enetaddr); - eth_putenv_enetaddr("eth3addr", enetaddr); + eth_setenv_enetaddr("eth3addr", enetaddr); } #endif diff --git a/board/xpedite1k/xpedite1k.c b/board/xpedite1k/xpedite1k.c index cd1a368..92dc628 100644 --- a/board/xpedite1k/xpedite1k.c +++ b/board/xpedite1k/xpedite1k.c @@ -364,27 +364,27 @@ int misc_init_r(void) if (!eth_getenv_enetaddr("ethaddr", enetaddr)) { board_get_enetaddr(i2c_enetaddr); - eth_putenv_enetaddr("ethaddr", i2c_enetaddr); + eth_setenv_enetaddr("ethaddr", i2c_enetaddr); } #ifdef CONFIG_HAS_ETH1 if (!eth_getenv_enetaddr("eth1addr", enetaddr)) { board_get_enetaddr(i2c_enetaddr); - eth_putenv_enetaddr("eth1addr", i2c_enetaddr); + eth_setenv_enetaddr("eth1addr", i2c_enetaddr); } #endif #ifdef CONFIG_HAS_ETH2 if (!eth_getenv_enetaddr("eth2addr", enetaddr)) { board_get_enetaddr(i2c_enetaddr); - eth_putenv_enetaddr("eth2addr", i2c_enetaddr); + eth_setenv_enetaddr("eth2addr", i2c_enetaddr); } #endif #ifdef CONFIG_HAS_ETH3 if (!eth_getenv_enetaddr("eth3addr", enetaddr)) { board_get_enetaddr(i2c_enetaddr); - eth_putenv_enetaddr("eth3addr", i2c_enetaddr); + eth_setenv_enetaddr("eth3addr", i2c_enetaddr); } #endif -- 1.6.2

2 1