October 2008 - U-Boot

[U-Boot] [PATCH v2 07/16] [PATCH] mgcoge, mgsuvd: added EEprom support.
by Heiko Schocher 15 Oct '08

15 Oct '08

Signed-off-by: Heiko Schocher <hs(a)denx.de> --- include/configs/mgcoge.h | 8 ++++++++ include/configs/mgsuvd.h | 7 +++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 159eeae..8cff642 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -82,6 +82,7 @@ #include <config_cmd_default.h> #define CONFIG_CMD_ECHO +#define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C #define CONFIG_CMD_IMMAP #define CONFIG_CMD_MII @@ -201,6 +202,13 @@ #define CONFIG_I2C_CMD_TREE 1 #define CFG_MAX_I2C_BUS 2 +/* EEprom support */ +#define CFG_I2C_EEPROM_ADDR_LEN 1 +#define CFG_I2C_MULTI_EEPROMS 1 +#define CFG_EEPROM_PAGE_WRITE_ENABLE +#define CFG_EEPROM_PAGE_WRITE_BITS 3 +#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 + #define CFG_IMMR 0xF0000000 #define CFG_INIT_RAM_ADDR CFG_IMMR diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h index f2cfe6e..85c6ac9 100644 --- a/include/configs/mgsuvd.h +++ b/include/configs/mgsuvd.h @@ -113,6 +113,7 @@ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP +#define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C #define CONFIG_CMD_NFS #define CONFIG_CMD_PING @@ -372,5 +373,11 @@ #define CONFIG_I2C_CMD_TREE 1 #define CFG_MAX_I2C_BUS 2 +/* EEprom support */ +#define CFG_I2C_EEPROM_ADDR_LEN 1 +#define CFG_I2C_MULTI_EEPROMS 1 +#define CFG_EEPROM_PAGE_WRITE_ENABLE +#define CFG_EEPROM_PAGE_WRITE_BITS 3 +#define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10 #endif /* __CONFIG_H */ -- 1.5.6.1 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

1 0

[U-Boot] [PATCH v2 06/16] [POWERPC] mgcoge, mgsuvd: add I2C support.
by Heiko Schocher 15 Oct '08

15 Oct '08

Signed-off-by: Heiko Schocher <hs(a)denx.de> --- board/keymile/mgcoge/mgcoge.c | 14 +++++++++++- board/keymile/mgsuvd/mgsuvd.c | 11 ++++++++++ include/configs/mgcoge.h | 25 +++++++++++++++++++++++ include/configs/mgsuvd.h | 43 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 2 deletions(-) diff --git a/board/keymile/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c index a6bf9bc..d3e46f5 100644 --- a/board/keymile/mgcoge/mgcoge.c +++ b/board/keymile/mgcoge/mgcoge.c @@ -24,11 +24,16 @@ #include <common.h> #include <mpc8260.h> #include <ioports.h> +#include <malloc.h> #if defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) #include <libfdt.h> #endif +#if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) +#include <i2c.h> +#endif + /* * I/O Port configuration table * @@ -163,8 +168,13 @@ const iop_conf_t iop_conf_tab[4][32] = { /* PD18 */ { 0, 0, 0, 0, 0, 0 }, /* PD18 */ /* PD17 */ { 0, 0, 0, 0, 0, 0 }, /* PD17 */ /* PD16 */ { 0, 0, 0, 0, 0, 0 }, /* PD16 */ - /* PD15 */ { 0, 0, 0, 0, 0, 0 }, /* PD15 */ - /* PD14 */ { 0, 0, 0, 0, 0, 0 }, /* PD14 */ +#if defined(CONFIG_HARD_I2C) + /* PD15 */ { 1, 1, 1, 0, 1, 0 }, /* I2C SDA */ + /* PD14 */ { 1, 1, 1, 0, 1, 0 }, /* I2C SCL */ +#else + /* PD15 */ { 1, 0, 0, 0, 1, 1 }, /* PD15 */ + /* PD14 */ { 1, 0, 0, 1, 1, 1 }, /* PD14 */ +#endif /* PD13 */ { 0, 0, 0, 0, 0, 0 }, /* PD13 */ /* PD12 */ { 0, 0, 0, 0, 0, 0 }, /* PD12 */ /* PD11 */ { 0, 0, 0, 0, 0, 0 }, /* PD11 */ diff --git a/board/keymile/mgsuvd/mgsuvd.c b/board/keymile/mgsuvd/mgsuvd.c index c51ea7e..62df832 100644 --- a/board/keymile/mgsuvd/mgsuvd.c +++ b/board/keymile/mgsuvd/mgsuvd.c @@ -225,3 +225,14 @@ void ft_board_setup(void *blob, bd_t *bd) ft_blob_update(blob, bd); } #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */ + +int i2c_soft_read_pin (void) +{ + int val; + + *(unsigned short *)(I2C_BASE_DIR) &= ~SDA_CONF; + udelay(1); + val = *(unsigned char *)(I2C_BASE_PORT); + + return ((val & SDA_BIT) == SDA_BIT); +} diff --git a/include/configs/mgcoge.h b/include/configs/mgcoge.h index 23af3ec..159eeae 100644 --- a/include/configs/mgcoge.h +++ b/include/configs/mgcoge.h @@ -82,6 +82,7 @@ #include <config_cmd_default.h> #define CONFIG_CMD_ECHO +#define CONFIG_CMD_I2C #define CONFIG_CMD_IMMAP #define CONFIG_CMD_MII #define CONFIG_CMD_PING @@ -176,6 +177,30 @@ #define CONFIG_ENV_ADDR (CFG_MONITOR_BASE + CFG_MONITOR_LEN) #endif /* CONFIG_ENV_IS_IN_FLASH */ +/* enable I2C and select the hardware/software driver */ +#undef CONFIG_HARD_I2C /* I2C with hardware support */ +#define CONFIG_SOFT_I2C 1 /* I2C bit-banged */ +#define CFG_I2C_SPEED 50000 /* I2C speed and slave address */ +#define CFG_I2C_SLAVE 0x7F + +/* + * Software (bit-bang) I2C driver configuration + */ + +#define I2C_PORT 3 /* Port A=0, B=1, C=2, D=3 */ +#define I2C_ACTIVE (iop->pdir |= 0x00010000) +#define I2C_TRISTATE (iop->pdir &= ~0x00010000) +#define I2C_READ ((iop->pdat & 0x00010000) != 0) +#define I2C_SDA(bit) if(bit) iop->pdat |= 0x00010000; \ + else iop->pdat &= ~0x00010000 +#define I2C_SCL(bit) if(bit) iop->pdat |= 0x00020000; \ + else iop->pdat &= ~0x00020000 +#define I2C_DELAY udelay(5) /* 1/4 I2C clock duration */ + +#define CONFIG_I2C_MULTI_BUS 1 +#define CONFIG_I2C_CMD_TREE 1 +#define CFG_MAX_I2C_BUS 2 + #define CFG_IMMR 0xF0000000 #define CFG_INIT_RAM_ADDR CFG_IMMR diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h index 740767e..f2cfe6e 100644 --- a/include/configs/mgsuvd.h +++ b/include/configs/mgsuvd.h @@ -113,6 +113,7 @@ #define CONFIG_CMD_ASKENV #define CONFIG_CMD_DHCP +#define CONFIG_CMD_I2C #define CONFIG_CMD_NFS #define CONFIG_CMD_PING @@ -330,4 +331,46 @@ #define OF_TBCLK (bd->bi_busfreq / 4) #define OF_STDOUT_PATH "/soc/cpm/serial@a80" +/* enable I2C and select the hardware/software driver */ +#undef CONFIG_HARD_I2C /* I2C with hardware support */ +#define CONFIG_SOFT_I2C 1 /* I2C bit-banged */ +#define CFG_I2C_SPEED 50000 /* I2C speed and slave address */ +#define CFG_I2C_SLAVE 0x7F +#define I2C_SOFT_DECLARATIONS + +/* + * Software (bit-bang) I2C driver configuration + */ +#define I2C_BASE_DIR (CFG_PIGGY_BASE + 0x04) +#define I2C_BASE_PORT (CFG_PIGGY_BASE + 0x09) + +#define SDA_BIT 0x40 +#define SCL_BIT 0x80 +#define SDA_CONF 0x1000 +#define SCL_CONF 0x2000 + +#define I2C_ACTIVE do {} while (0) +#define I2C_TRISTATE do {} while (0) +#define I2C_READ i2c_soft_read_pin () +#define I2C_SDA(bit) if(bit) { \ + *(unsigned short *)(I2C_BASE_DIR) &= ~SDA_CONF; \ + } \ + else { \ + *(unsigned char *)(I2C_BASE_PORT) &= ~SDA_BIT; \ + *(unsigned short *)(I2C_BASE_DIR) |= SDA_CONF; \ + } +#define I2C_SCL(bit) if(bit) { \ + *(unsigned short *)(I2C_BASE_DIR) &= ~SCL_CONF; \ + } \ + else { \ + *(unsigned char *)(I2C_BASE_PORT) &= ~SCL_BIT; \ + *(unsigned short *)(I2C_BASE_DIR) |= SCL_CONF; \ + } +#define I2C_DELAY udelay(50) /* 1/4 I2C clock duration */ + +#define CONFIG_I2C_MULTI_BUS 1 +#define CONFIG_I2C_CMD_TREE 1 +#define CFG_MAX_I2C_BUS 2 + + #endif /* __CONFIG_H */ -- 1.5.6.1 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

1 0

[U-Boot] [PATCH v2 04/16] i2c: add CONFIG_I2C_MULTI_BUS for soft_i2c and mpc8260 i2c driver.
by Heiko Schocher 15 Oct '08

15 Oct '08

Signed-off-by: Heiko Schocher <hs(a)denx.de> --- cpu/mpc8260/i2c.c | 36 ++++++++++++++++++++++++++++++++++++ drivers/i2c/soft_i2c.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/cpu/mpc8260/i2c.c b/cpu/mpc8260/i2c.c index c3af7b6..335177f 100644 --- a/cpu/mpc8260/i2c.c +++ b/cpu/mpc8260/i2c.c @@ -36,6 +36,10 @@ DECLARE_GLOBAL_DATA_PTR; +#if defined(CONFIG_I2C_MULTI_BUS) +static unsigned int i2c_bus_num __attribute__ ((section ("data"))) = 0; +#endif /* CONFIG_I2C_MULTI_BUS */ + /* uSec to wait between polls of the i2c */ #define DELAY_US 100 /* uSec to wait for the CPM to start processing the buffer */ @@ -765,4 +769,36 @@ i2c_reg_write(uchar chip, uchar reg, uchar val) i2c_write(chip, reg, 1, &val, 1); } +#if defined(CONFIG_I2C_MULTI_BUS) +/* + * Functions for multiple I2C bus handling + */ +unsigned int i2c_get_bus_num(void) +{ + return i2c_bus_num; +} + +int i2c_set_bus_num(unsigned int bus) +{ + if (bus >= CFG_MAX_I2C_BUS) + return -1; + i2c_bus_num = bus; + + return 0; +} +/* TODO: add 100/400k switching */ +unsigned int i2c_get_bus_speed(void) +{ + return CFG_I2C_SPEED; +} + +int i2c_set_bus_speed(unsigned int speed) +{ + if (speed != CFG_I2C_SPEED) + return -1; + + return 0; +} + +#endif /* CONFIG_I2C_MULTI_BUS */ #endif /* CONFIG_HARD_I2C */ diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index 23db2ee..57736da 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -68,6 +68,10 @@ DECLARE_GLOBAL_DATA_PTR; #define PRINTD(fmt,args...) #endif +#if defined(CONFIG_I2C_MULTI_BUS) +static unsigned int i2c_bus_num __attribute__ ((section ("data"))) = 0; +#endif /* CONFIG_I2C_MULTI_BUS */ + /*----------------------------------------------------------------------- * Local functions */ @@ -230,6 +234,38 @@ static int write_byte(uchar data) return(nack); /* not a nack is an ack */ } +#if defined(CONFIG_I2C_MULTI_BUS) +/* + * Functions for multiple I2C bus handling + */ +unsigned int i2c_get_bus_num(void) +{ + return i2c_bus_num; +} + +int i2c_set_bus_num(unsigned int bus) +{ + if (bus >= CFG_MAX_I2C_BUS) + return -1; + i2c_bus_num = bus; + + return 0; +} + +/* TODO: add 100/400k switching */ +unsigned int i2c_get_bus_speed(void) +{ + return CFG_I2C_SPEED; +} + +int i2c_set_bus_speed(unsigned int speed) +{ + if (speed != CFG_I2C_SPEED) + return -1; + + return 0; +} +#endif /*----------------------------------------------------------------------- * if ack == I2C_ACK, ACK the byte so can continue reading, else -- 1.5.6.1 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

1 0

[U-Boot] [PATCH v2 03/16] [POWERPC] mgcoge: fix Codingstyle issues.
by Heiko Schocher 15 Oct '08

15 Oct '08

Signed-off-by: Heiko Schocher <hs(a)denx.de> --- board/keymile/mgcoge/mgcoge.c | 79 +++++++++++++++++++--------------------- 1 files changed, 38 insertions(+), 41 deletions(-) diff --git a/board/keymile/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c index 51b6dc6..a6bf9bc 100644 --- a/board/keymile/mgcoge/mgcoge.c +++ b/board/keymile/mgcoge/mgcoge.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2007 + * (C) Copyright 2007 - 2008 * Heiko Schocher, DENX Software Engineering, hs(a)denx.de. * * See file CREDITS for list of people who contributed to this @@ -243,13 +243,13 @@ static long int try_init (volatile memctl8260_t * memctl, ulong sdmr, *sdmr_ptr = sdmr | PSDMR_OP_NORM | PSDMR_RFEN; *base = c; - size = get_ram_size((long *)base, maxsize); + size = get_ram_size ((long *)base, maxsize); *orx_ptr = orx | ~(size - 1); return (size); } -phys_size_t initdram(int board_type) +phys_size_t initdram (int board_type) { volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile memctl8260_t *memctl = &immap->im_memctl; @@ -273,7 +273,7 @@ phys_size_t initdram(int board_type) int checkboard(void) { - puts("Board: mgcoge\n"); + puts ("Board: mgcoge\n"); return 0; } @@ -281,7 +281,7 @@ int checkboard(void) /* * Early board initalization. */ -int board_early_init_r(void) +int board_early_init_r (void) { /* setup the UPIOx */ *(char *)(CFG_PIGGY_BASE + 0x02) = 0xc0; @@ -293,68 +293,65 @@ int board_early_init_r(void) /* * update "memory" property in the blob */ -void ft_blob_update(void *blob, bd_t *bd) +void ft_blob_update (void *blob, bd_t *bd) { int ret, nodeoffset = 0; ulong memory_data[2] = {0}; ulong flash_data[8] = {0}; - memory_data[0] = cpu_to_be32(bd->bi_memstart); - memory_data[1] = cpu_to_be32(bd->bi_memsize); + memory_data[0] = cpu_to_be32 (bd->bi_memstart); + memory_data[1] = cpu_to_be32 (bd->bi_memsize); nodeoffset = fdt_path_offset (blob, "/memory"); if (nodeoffset >= 0) { - ret = fdt_setprop(blob, nodeoffset, "reg", memory_data, - sizeof(memory_data)); + ret = fdt_setprop (blob, nodeoffset, "reg", memory_data, + sizeof (memory_data)); if (ret < 0) - printf("ft_blob_update(): cannot set /memory/reg " - "property err:%s\n", fdt_strerror(ret)); - } - else { + printf ("ft_blob_update(): cannot set /memory/reg " + "property err:%s\n", fdt_strerror (ret)); + } else { /* memory node is required in dts */ - printf("ft_blob_update(): cannot find /memory node " - "err:%s\n", fdt_strerror(nodeoffset)); + printf ("ft_blob_update(): cannot find /memory node " + "err:%s\n", fdt_strerror (nodeoffset)); } /* update Flash addr, size */ - flash_data[2] = cpu_to_be32(CFG_FLASH_BASE); - flash_data[3] = cpu_to_be32(CFG_FLASH_SIZE); - flash_data[4] = cpu_to_be32(1); - flash_data[5] = cpu_to_be32(0); - flash_data[6] = cpu_to_be32(CFG_FLASH_BASE_1); - flash_data[7] = cpu_to_be32(CFG_FLASH_SIZE_1); + flash_data[2] = cpu_to_be32 (CFG_FLASH_BASE); + flash_data[3] = cpu_to_be32 (CFG_FLASH_SIZE); + flash_data[4] = cpu_to_be32 (1); + flash_data[5] = cpu_to_be32 (0); + flash_data[6] = cpu_to_be32 (CFG_FLASH_BASE_1); + flash_data[7] = cpu_to_be32 (CFG_FLASH_SIZE_1); nodeoffset = fdt_path_offset (blob, "/localbus"); if (nodeoffset >= 0) { - ret = fdt_setprop(blob, nodeoffset, "ranges", flash_data, - sizeof(flash_data)); + ret = fdt_setprop (blob, nodeoffset, "ranges", flash_data, + sizeof (flash_data)); if (ret < 0) - printf("ft_blob_update(): cannot set /localbus/ranges " - "property err:%s\n", fdt_strerror(ret)); - } - else { + printf ("ft_blob_update(): cannot set /localbus/ranges " + "property err:%s\n", fdt_strerror (ret)); + } else { /* memory node is required in dts */ - printf("ft_blob_update(): cannot find /localbus node " - "err:%s\n", fdt_strerror(nodeoffset)); + printf ("ft_blob_update(): cannot find /localbus node " + "err:%s\n", fdt_strerror (nodeoffset)); } /* MAC Adresse */ nodeoffset = fdt_path_offset (blob, "/soc/cpm/ethernet"); if (nodeoffset >= 0) { - ret = fdt_setprop(blob, nodeoffset, "mac-address", bd->bi_enetaddr, - sizeof(uchar) * 6); + ret = fdt_setprop (blob, nodeoffset, "mac-address", bd->bi_enetaddr, + sizeof (uchar) * 6); if (ret < 0) - printf("ft_blob_update(): cannot set /soc/cpm/ethernet/mac-address " - "property err:%s\n", fdt_strerror(ret)); - } - else { + printf ("ft_blob_update(): cannot set /soc/cpm/ethernet/mac-address " + "property err:%s\n", fdt_strerror (ret)); + } else { /* memory node is required in dts */ - printf("ft_blob_update(): cannot find /soc/cpm/ethernet node " - "err:%s\n", fdt_strerror(nodeoffset)); + printf ("ft_blob_update(): cannot find /soc/cpm/ethernet node " + "err:%s\n", fdt_strerror (nodeoffset)); } } -void ft_board_setup(void *blob, bd_t *bd) +void ft_board_setup (void *blob, bd_t *bd) { - ft_cpu_setup( blob, bd); - ft_blob_update(blob, bd); + ft_cpu_setup (blob, bd); + ft_blob_update (blob, bd); } #endif /* defined(CONFIG_OF_BOARD_SETUP) && defined(CONFIG_OF_LIBFDT) */ -- 1.5.6.1 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

1 0

[U-Boot] [PATCH v2 01/16] [POWERPC] mgsuvd, mgcoge: move this 2 boards in one dir.
by Heiko Schocher 15 Oct '08

15 Oct '08

There are some more extensions, which are for both boards and some more boards from this manufacturer will follow soon. Signed-off-by: Heiko Schocher <hs(a)denx.de> --- Makefile | 4 ++-- board/{ => keymile}/mgcoge/Makefile | 0 board/{ => keymile}/mgcoge/config.mk | 0 board/{ => keymile}/mgcoge/mgcoge.c | 0 board/{ => keymile}/mgsuvd/Makefile | 0 board/{ => keymile}/mgsuvd/config.mk | 0 board/{ => keymile}/mgsuvd/mgsuvd.c | 0 board/{ => keymile}/mgsuvd/u-boot.lds | 0 8 files changed, 2 insertions(+), 2 deletions(-) rename board/{ => keymile}/mgcoge/Makefile (100%) rename board/{ => keymile}/mgcoge/config.mk (100%) rename board/{ => keymile}/mgcoge/mgcoge.c (100%) rename board/{ => keymile}/mgsuvd/Makefile (100%) rename board/{ => keymile}/mgsuvd/config.mk (100%) rename board/{ => keymile}/mgsuvd/mgsuvd.c (100%) rename board/{ => keymile}/mgsuvd/u-boot.lds (100%) diff --git a/Makefile b/Makefile index 7c13ce8..7c6c786 100644 --- a/Makefile +++ b/Makefile @@ -922,7 +922,7 @@ MBX860T_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc8xx mbx8xx mgsuvd_config: unconfig - @$(MKCONFIG) $(@:_config=) ppc mpc8xx mgsuvd + @$(MKCONFIG) $(@:_config=) ppc mpc8xx mgsuvd keymile MHPC_config: unconfig @$(MKCONFIG) $(@:_config=) ppc mpc8xx mhpc eltec @@ -1706,7 +1706,7 @@ ISPAN_REVB_config: unconfig @$(MKCONFIG) -a ISPAN ppc mpc8260 ispan mgcoge_config : unconfig - @$(MKCONFIG) mgcoge ppc mpc8260 mgcoge + @$(MKCONFIG) mgcoge ppc mpc8260 mgcoge keymile MPC8260ADS_config \ MPC8260ADS_lowboot_config \ diff --git a/board/mgcoge/Makefile b/board/keymile/mgcoge/Makefile similarity index 100% rename from board/mgcoge/Makefile rename to board/keymile/mgcoge/Makefile diff --git a/board/mgcoge/config.mk b/board/keymile/mgcoge/config.mk similarity index 100% rename from board/mgcoge/config.mk rename to board/keymile/mgcoge/config.mk diff --git a/board/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c similarity index 100% rename from board/mgcoge/mgcoge.c rename to board/keymile/mgcoge/mgcoge.c diff --git a/board/mgsuvd/Makefile b/board/keymile/mgsuvd/Makefile similarity index 100% rename from board/mgsuvd/Makefile rename to board/keymile/mgsuvd/Makefile diff --git a/board/mgsuvd/config.mk b/board/keymile/mgsuvd/config.mk similarity index 100% rename from board/mgsuvd/config.mk rename to board/keymile/mgsuvd/config.mk diff --git a/board/mgsuvd/mgsuvd.c b/board/keymile/mgsuvd/mgsuvd.c similarity index 100% rename from board/mgsuvd/mgsuvd.c rename to board/keymile/mgsuvd/mgsuvd.c diff --git a/board/mgsuvd/u-boot.lds b/board/keymile/mgsuvd/u-boot.lds similarity index 100% rename from board/mgsuvd/u-boot.lds rename to board/keymile/mgsuvd/u-boot.lds -- 1.5.6.1 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

1 0

[U-Boot] [PATCH] cmd_i2c: Update available commands when CONFIG_I2C_CMD_TREE is defined
by Peter Tyser 15 Oct '08

15 Oct '08

If CONFIG_I2C_CMD_TREE is defined, individual i2c commands such as 'imd', 'imm', 'imw', etc should not be available as their functionality is duplicated in the 'i2c' command. Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- common/cmd_i2c.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/common/cmd_i2c.c b/common/cmd_i2c.c index ea80e8a..8a3cf10 100644 --- a/common/cmd_i2c.c +++ b/common/cmd_i2c.c @@ -1248,11 +1248,9 @@ int do_i2c(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) printf ("Usage:\n%s\n", cmdtp->usage); return 0; } -#endif /* CONFIG_I2C_CMD_TREE */ /***************************************************/ -#if defined(CONFIG_I2C_CMD_TREE) U_BOOT_CMD( i2c, 6, 1, do_i2c, "i2c - I2C sub-system\n", @@ -1271,7 +1269,7 @@ U_BOOT_CMD( "i2c sdram chip - print SDRAM configuration information\n" #endif ); -#endif /* CONFIG_I2C_CMD_TREE */ +#else /* !CONFIG_I2C_CMD_TREE */ U_BOOT_CMD( imd, 4, 1, do_i2c_md, \ "imd - i2c memory display\n", \ @@ -1326,3 +1324,4 @@ U_BOOT_CMD( " (valid chip values 50..57)\n" ); #endif +#endif /* CONFIG_I2C_CMD_TREE */ -- 1.6.0.2.GIT

3 4

[U-Boot] [PATCH] mpc83xx: add support for switching between USB Host/Function for MPC837XEMDS
by Anton Vorontsov 15 Oct '08

15 Oct '08

With this patch u-boot can fixup the dr_mode and phy_type properties for the Dual-Role USB controller. Signed-off-by: Anton Vorontsov <avorontsov(a)ru.mvista.com> --- board/freescale/mpc837xemds/mpc837xemds.c | 1 + include/configs/MPC837XEMDS.h | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/board/freescale/mpc837xemds/mpc837xemds.c b/board/freescale/mpc837xemds/mpc837xemds.c index 8bc54d1..094d0c0 100644 --- a/board/freescale/mpc837xemds/mpc837xemds.c +++ b/board/freescale/mpc837xemds/mpc837xemds.c @@ -314,6 +314,7 @@ void ft_board_setup(void *blob, bd_t *bd) { ft_cpu_setup(blob, bd); ft_tsec_fixup(blob, bd); + fdt_fixup_dr_usb(blob, bd); #ifdef CONFIG_PCI ft_pci_setup(blob, bd); if (board_pci_host_broken()) diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index d78aa60..6e4a65c 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -360,6 +360,8 @@ extern int board_pci_host_broken(void); #define CONFIG_83XX_GENERIC_PCI 1 /* Use generic PCI setup */ #define CONFIG_PQ_MDS_PIB 1 /* PQ MDS Platform IO Board */ +#define CONFIG_HAS_FSL_DR_USB 1 /* fixup device tree for the DR USB */ + #define CONFIG_NET_MULTI #define CONFIG_PCI_PNP /* do pci plug-and-play */ -- 1.5.6.3

2 2

[U-Boot] MPC83xx Patches
by Wolfgang Denk 15 Oct '08

15 Oct '08

Dear Kim, here is a list of MPC83xx patches which seem to be still pending: 8484 10/02 Anton Vorontsov [U-Boot] [PATCH 1/4] mpc83xx: fix serdes setup for the MPC8378E board 8485 10/02 Anton Vorontsov [U-Boot] [PATCH 2/4] mpc83xx: serdes: add forgotten shifts for rfcks< 8486 10/02 Anton Vorontsov [U-Boot] [PATCH 3/4] mpc83xx: add TSECs' HRCWH masks for MPC837x proc 8487 10/02 Anton Vorontsov [U-Boot] [PATCH 4/4] mpc83xx: add SGMII riser module support for the 9051 10/14 Selvamuthukumar [U-Boot] [PATCH] mpc83xx: Fix the wrong comment.<<--- cpu/mpc83xx/cpu 9111 10/14 Anton Vorontsov [U-Boot] [PATCH v2] mpc83xx: add support for switching between USB Ho Please comment... 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: wd(a)denx.de "The combination of a number of things to make existence worthwhile." "Yes, the philosophy of 'none,' meaning 'all.'" -- Spock and Lincoln, "The Savage Curtain", stardate 5906.4

3 4

[U-Boot] [PATCH] mpc83xx: Fix the wrong comment.
by Selvamuthukumar 15 Oct '08

15 Oct '08

--- cpu/mpc83xx/cpu.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index 63aa8a4..697482c 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -124,8 +124,8 @@ int checkcpu(void) * The 'dummy' variable is used to increment the MAD. 'dummy' is * supposed to be a pointer to the memory of the device being * programmed by the UPM. The data in the MDR is written into - * memory and the MAD is incremented every time there's a read - * from 'dummy'. Unfortunately, the current prototype for this + * memory and the MAD is incremented every time there's a write + * to 'dummy'. Unfortunately, the current prototype for this * function doesn't allow for passing the address of this * device, and changing the prototype will break a number lots * of other code, so we need to use a round-about way of finding -- 1.5.5

2 1

[U-Boot] [PATCH] Add feature-removal-schedule.txt
by Peter Tyser 15 Oct '08

15 Oct '08

Add a text file which lists features to be removed from U-Boot in the future. The initial entry plans for removal of individual I2C commands. Signed-off-by: Peter Tyser <ptyser(a)xes-inc.com> --- I wasn't sure what to make of the 'Deprecate "autosrc" command' on http://www.denx.de/wiki/U-Boot/TaskFeatureRemovalSchedule - I'm not familiar with it and didn't see any references to it in the current U-Boot tree. doc/feature-removal-schedule.txt | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) create mode 100644 doc/feature-removal-schedule.txt diff --git a/doc/feature-removal-schedule.txt b/doc/feature-removal-schedule.txt new file mode 100644 index 0000000..0c44f8a --- /dev/null +++ b/doc/feature-removal-schedule.txt @@ -0,0 +1,17 @@ +The following is a list of files and features that are going to be +removed from the U-Boot source tree. Every entry should contain what +exactly is going away, why it is happening, and who is going to be doing +the work. When the feature is removed from U-Boot, it should also +be removed from this file. + +--------------------------- + +What: Individual I2C commands +When: April 2009 +Why: Per the U-Boot README, individual I2C commands such as "imd", "imm", + "imw", etc are deprecated. The single "i2c" command which is + currently enabled via CONFIG_I2C_CMD_TREE contains the same + functionality as the individual I2C commands. The individual + I2C commands should be removed as well as any references to + CONFIG_I2C_CMD_TREE. +Who: Peter Tyser <ptyser(a)xes-inc.com> -- 1.6.0.2.GIT

1 0