November 2011 - U-Boot

[U-Boot] [PATCH 0/4] Add code to read in the coreboot tables and fill in memory info.
by Gabe Black 08 Jan '12

08 Jan '12

These changes add code which reads in the coreboot tables exported by coreboot and puts the info into a single structure for easy access. It also adds some code which uses that info to fill in an e820 table. Gabe Black (4): x86: Import code from coreboot's libpayload to parse the coreboot table x86: Determine the ram size using the coreboot tables x86: Force the lib_sysinfo structure to be in the .data section x86: Add infrastructure to extract an e820 table from the coreboot tables arch/x86/cpu/coreboot/Makefile | 3 + arch/x86/cpu/coreboot/ipchecksum.c | 54 ++++++ arch/x86/cpu/coreboot/sdram.c | 38 ++++- arch/x86/cpu/coreboot/sysinfo.c | 39 ++++ arch/x86/cpu/coreboot/tables.c | 183 +++++++++++++++++++ arch/x86/include/asm/ic/coreboot/ipchecksum.h | 37 ++++ arch/x86/include/asm/ic/coreboot/sysinfo.h | 64 +++++++ arch/x86/include/asm/ic/coreboot/tables.h | 241 +++++++++++++++++++++++++ arch/x86/include/asm/zimage.h | 5 + arch/x86/lib/zimage.c | 10 + board/chromebook-x86/coreboot/coreboot.c | 10 + 11 files changed, 683 insertions(+), 1 deletions(-) create mode 100644 arch/x86/cpu/coreboot/ipchecksum.c create mode 100644 arch/x86/cpu/coreboot/sysinfo.c create mode 100644 arch/x86/cpu/coreboot/tables.c create mode 100644 arch/x86/include/asm/ic/coreboot/ipchecksum.h create mode 100644 arch/x86/include/asm/ic/coreboot/sysinfo.h create mode 100644 arch/x86/include/asm/ic/coreboot/tables.h -- 1.7.3.1

4 13

[U-Boot] [PATCH] NAND: remove remaining NAND_MAX_CHIPS definitions
by Vladimir Zapolskiy 06 Jan '12

06 Jan '12

This change follows the change by Wolfgang Grandegger (commit 6c869637fef), which allows to remove useless NAND_MAX_CHIPS definitions in board config files. The change is based on u-boot.git/master, this branch contains 3 new boards with the defined NAND_MAX_CHIPS macro, which are not present in u-boot-nand-flash.git/master. Vladimir Zapolskiy (1): NAND: remove NAND_MAX_CHIPS definitions include/configs/P1_P2_RDB.h | 3 +-- include/configs/SIMPC8313.h | 3 +-- include/configs/VCMA9.h | 1 - include/configs/aria.h | 4 ---- include/configs/bf526-ezbrd.h | 1 - include/configs/bf527-ad7160-eval.h | 1 - include/configs/bf527-ezkit.h | 1 - include/configs/bf548-ezkit.h | 1 - include/configs/cm-bf527.h | 1 - include/configs/cpu9260.h | 1 - include/configs/da830evm.h | 1 - include/configs/da850_am18xxevm.h | 1 - include/configs/da850evm.h | 1 - include/configs/ea20.h | 1 - include/configs/hawkboard.h | 1 - include/configs/km/km_arm.h | 1 - include/configs/m28evk.h | 1 - include/configs/mecp5123.h | 2 -- include/configs/mpc5121ads.h | 1 - include/configs/mv-common.h | 1 - include/configs/pdm360ng.h | 2 -- include/configs/pm9261.h | 1 - include/configs/qi_lb60.h | 1 - include/configs/smdk2410.h | 1 - include/configs/tnetv107x_evm.h | 1 - 25 files changed, 2 insertions(+), 32 deletions(-) -- 1.7.5.4

3 8

[U-Boot] [PATCH 0/2] tegra2: Fixes for running mainline U-Boot.
by Thierry Reding 06 Jan '12

06 Jan '12

The following series contains two patches that allow mainline U-Boot to boot standalone on Tegra2-based boards. It assumes the standard NVIDIA flashing tools as provided by the Linux4Tegra package. The series is based on patches that have already been reviewed but haven't been merged upstream yet. They are available in patchwork here: http://patchwork.ozlabs.org/patch/122888 http://patchwork.ozlabs.org/patch/122887 http://patchwork.ozlabs.org/patch/122889 http://patchwork.ozlabs.org/patch/123845 (9 patches) Thierry Reding (2): tegra2: Always build with USE_PRIVATE_LIBGCC=yes. tegra2: Change CONFIG_SYS_TEXT_BASE to 0x00108000. arch/arm/cpu/armv7/tegra2/config.mk | 2 ++ include/configs/tegra2-common.h | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) -- 1.7.7.3

5 16

[U-Boot] [PATCH] mmc: add host_caps checking avoid switch card improperly
by Macpaul Lin 30 Dec '11

30 Dec '11

Add a host capability checking to avoid the mmc stack switch the card to HIGHSPEED mode when the card supports HIGHSPEED while the host doesn't. This patch avoid furthur transaction problem when the mmc/sd card runs different mode to the host. Signed-off-by: Macpaul Lin <macpaul(a)andestech.com> --- drivers/mmc/mmc.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 21665ec..ce34d05 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -785,6 +785,16 @@ retry_scr: if (!(__be32_to_cpu(switch_status[3]) & SD_HIGHSPEED_SUPPORTED)) return 0; + /* + * If the host doesn't support SD_HIGHSPEED, do not switch card to + * HIGHSPEED mode even if the card support SD_HIGHSPPED. + * This can avoid furthur problem when the card runs in different + * mode between the host. + */ + if (!((mmc->host_caps & MMC_MODE_HS_52MHz) || + (mmc->host_caps & MMC_MODE_HS))) + return 0; + err = sd_switch(mmc, SD_SWITCH_SWITCH, 0, 1, (u8 *)switch_status); if (err) -- 1.7.3.5

4 11

[U-Boot] [PATCH] ftsdc010: improve performance and capability
by Macpaul Lin 30 Dec '11

30 Dec '11

This patch improve the performance by spliting flag examination code in ftsdc010_send_cmd() into 3 functions. This patch also reordered the function which made better capability to some high performance cards against to the next version of ftsdc010 hardware. Signed-off-by: Macpaul Lin <macpaul(a)andestech.com> --- drivers/mmc/ftsdc010_esdhc.c | 172 +++++++++++++++++++++++------------------- 1 files changed, 93 insertions(+), 79 deletions(-) diff --git a/drivers/mmc/ftsdc010_esdhc.c b/drivers/mmc/ftsdc010_esdhc.c index e38dd87..538800b 100644 --- a/drivers/mmc/ftsdc010_esdhc.c +++ b/drivers/mmc/ftsdc010_esdhc.c @@ -90,8 +90,13 @@ static void ftsdc010_pio_read(struct mmc_host *host, char *buf, unsigned int siz while (size) { status = readl(&host->reg->status); + debug("%s: size: %08x\n", __func__, size); if (status & FTSDC010_STATUS_FIFO_ORUN) { + + debug("%s: FIFO OVERRUN: sta: %08x\n", + __func__, status); + fifo = host->fifo_len > size ? size : host->fifo_len; @@ -146,7 +151,7 @@ static void ftsdc010_pio_write(struct mmc_host *host, const char *buf, while (size) { status = readl(&host->reg->status); - if (status & FTSDC010_STATUS_FIFO_ORUN) { + if (status & FTSDC010_STATUS_FIFO_URUN) { fifo = host->fifo_len > size ? size : host->fifo_len; @@ -158,7 +163,6 @@ static void ftsdc010_pio_write(struct mmc_host *host, const char *buf, writel(*ptr, &host->reg->dwr); ptr++; } - } else { udelay(1); if (++retry >= FTSDC010_PIO_RETRY) { @@ -169,56 +173,19 @@ static void ftsdc010_pio_write(struct mmc_host *host, const char *buf, } } -static int ftsdc010_pio_check_status(struct mmc *mmc, struct mmc_cmd *cmd, +static int ftsdc010_check_rsp(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data) { struct mmc_host *host = mmc->priv; - unsigned int sta, clear; - unsigned int i; - - /* check response and hardware status */ - clear = 0; - - /* chech CMD_SEND */ - for (i = 0; i < FTSDC010_CMD_RETRY; i++) { - sta = readl(&host->reg->status); - /* Command Complete */ - if (sta & FTSDC010_STATUS_CMD_SEND) { - if (!data) - clear |= FTSDC010_CLR_CMD_SEND; - break; - } - } - - if (i > FTSDC010_CMD_RETRY) { - printf("%s: send command timeout\n", __func__); - return TIMEOUT; - } - /* debug: print status register and command index*/ - debug("sta: %08x cmd %d\n", sta, cmd->cmdidx); - - /* handle data FIFO */ - if ((sta & FTSDC010_STATUS_FIFO_ORUN) || - (sta & FTSDC010_STATUS_FIFO_URUN)) { - - /* Wrong DATA FIFO Flag */ - if (data == NULL) - printf("%s, data fifo wrong: sta: %08x cmd %d\n", - __func__, sta, cmd->cmdidx); - - if (sta & FTSDC010_STATUS_FIFO_ORUN) - clear |= FTSDC010_STATUS_FIFO_ORUN; - if (sta & FTSDC010_STATUS_FIFO_URUN) - clear |= FTSDC010_STATUS_FIFO_URUN; - } + sta = readl(&host->reg->status); + debug("%s: sta: %08x cmd %d\n", __func__, sta, cmd->cmdidx); /* check RSP TIMEOUT or FAIL */ if (sta & FTSDC010_STATUS_RSP_TIMEOUT) { /* RSP TIMEOUT */ - debug("%s: RSP timeout: sta: %08x cmd %d\n", - __func__, sta, cmd->cmdidx); + debug("%s: RSP timeout: sta: %08x\n", __func__, sta); clear |= FTSDC010_CLR_RSP_TIMEOUT; writel(clear, &host->reg->clr); @@ -226,47 +193,62 @@ static int ftsdc010_pio_check_status(struct mmc *mmc, struct mmc_cmd *cmd, return TIMEOUT; } else if (sta & FTSDC010_STATUS_RSP_CRC_FAIL) { /* clear response fail bit */ - debug("%s: RSP CRC FAIL: sta: %08x cmd %d\n", - __func__, sta, cmd->cmdidx); + debug("%s: RSP CRC FAIL: sta: %08x\n", __func__, sta); clear |= FTSDC010_CLR_RSP_CRC_FAIL; writel(clear, &host->reg->clr); - return 0; + return COMM_ERR; } else if (sta & FTSDC010_STATUS_RSP_CRC_OK) { /* clear response CRC OK bit */ clear |= FTSDC010_CLR_RSP_CRC_OK; } + writel(clear, &host->reg->clr); + return 0; +} + +static int ftsdc010_check_data(struct mmc *mmc, struct mmc_cmd *cmd, + struct mmc_data *data) +{ + struct mmc_host *host = mmc->priv; + unsigned int sta, clear; + + sta = readl(&host->reg->status); + debug("%s: sta: %08x cmd %d\n", __func__, sta, cmd->cmdidx); + /* check DATA TIMEOUT or FAIL */ if (data) { + if (sta & FTSDC010_STATUS_DATA_END) { + /* Transfer Complete */ + clear |= FTSDC010_STATUS_DATA_END; + } + + if (sta & FTSDC010_STATUS_DATA_CRC_OK) { + /* Data CRC_OK */ + clear |= FTSDC010_STATUS_DATA_CRC_OK; + } + if (sta & FTSDC010_STATUS_DATA_TIMEOUT) { /* DATA TIMEOUT */ - debug("%s: DATA TIMEOUT: sta: %08x\n", - __func__, sta); + debug("%s: DATA TIMEOUT: sta: %08x\n", __func__, sta); clear |= FTSDC010_STATUS_DATA_TIMEOUT; writel(sta, &host->reg->clr); + return TIMEOUT; } else if (sta & FTSDC010_STATUS_DATA_CRC_FAIL) { /* Error Interrupt */ - debug("%s: DATA CRC FAIL: sta: %08x\n", - __func__, sta); + debug("%s: DATA CRC FAIL: sta: %08x\n", __func__, sta); clear |= FTSDC010_STATUS_DATA_CRC_FAIL; writel(clear, &host->reg->clr); - return 0; - } else if (sta & FTSDC010_STATUS_DATA_END) { - /* Transfer Complete */ - clear |= FTSDC010_STATUS_DATA_END; + return COMM_ERR; } + writel(clear, &host->reg->clr); } - - /* transaction is success and clear status register */ - writel(clear, &host->reg->clr); - return 0; } @@ -281,6 +263,9 @@ static int ftsdc010_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, unsigned int ccon; unsigned int mask, tmpmask; unsigned int ret; + unsigned int sta, clear, i; + + ret = 0; if (data) mask = FTSDC010_INT_MASK_RSP_TIMEOUT; @@ -290,13 +275,8 @@ static int ftsdc010_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, mask = FTSDC010_INT_MASK_CMD_SEND; /* write argu reg */ - debug("%s: cmd->arg: %08x\n", __func__, cmd->cmdarg); writel(cmd->cmdarg, &host->reg->argu); - /* setup cmd reg */ - debug("cmd: %d\n", cmd->cmdidx); - debug("resp: %08x\n", cmd->resp_type); - /* setup commnad */ ccon = FTSDC010_CMD_IDX(cmd->cmdidx); @@ -342,6 +322,45 @@ static int ftsdc010_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, writel(ccon, &host->reg->cmd); udelay(4*FTSDC010_DELAY_UNIT); + /* check CMD_SEND */ + /* + * Note: + * Do not clear FTSDC010_CLR_CMD_SEND flag here, + * (write FTSDC010_CLR_CMD_SEND bit to clear register) + * it will made the driver becomes very slow. + * If the operation hasn't been finished, hardware will + * clear this bit automatically. + */ + for (i = 0; i < FTSDC010_CMD_RETRY; i++) { + sta = readl(&host->reg->status); + /* Command Complete */ + if (sta & FTSDC010_STATUS_CMD_SEND) { + if (!data) + clear |= FTSDC010_CLR_CMD_SEND; + break; + } + } + + if (i > FTSDC010_CMD_RETRY) { + printf("%s: send command timeout\n", __func__); + return TIMEOUT; + } + + /* check rsp status */ + ret = ftsdc010_check_rsp(mmc, cmd, data); + if (ret) + return ret; + + /* read response if we have RSP_OK */ + if (ccon & FTSDC010_CMD_LONG_RSP) { + cmd->response[0] = readl(&host->reg->rsp3); + cmd->response[1] = readl(&host->reg->rsp2); + cmd->response[2] = readl(&host->reg->rsp1); + cmd->response[3] = readl(&host->reg->rsp0); + } else { + cmd->response[0] = readl(&host->reg->rsp0); + } + /* read/write data */ if (data && (data->flags & MMC_DATA_READ)) { ftsdc010_pio_read(host, data->dest, @@ -351,19 +370,11 @@ static int ftsdc010_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, data->blocksize * data->blocks); } - /* pio check response status */ - ret = ftsdc010_pio_check_status(mmc, cmd, data); - if (!ret) { - /* if it is long response */ - if (ccon & FTSDC010_CMD_LONG_RSP) { - cmd->response[0] = readl(&host->reg->rsp3); - cmd->response[1] = readl(&host->reg->rsp2); - cmd->response[2] = readl(&host->reg->rsp1); - cmd->response[3] = readl(&host->reg->rsp0); - - } else { - cmd->response[0] = readl(&host->reg->rsp0); - } + /* check data status */ + if (data) { + ret = ftsdc010_check_data(mmc, cmd, data); + if (ret) + return ret; } udelay(FTSDC010_DELAY_UNIT); @@ -431,8 +442,6 @@ static int ftsdc010_setup_data(struct mmc *mmc, struct mmc_data *data) /* always reset fifo since last transfer may fail */ dcon |= FTSDC010_DCR_FIFO_RST; - /* handle sdio */ - dcon = data->blocksize | data->blocks << 15; if (data->blocks > 1) dcon |= FTSDC010_SDIO_CTRL1_SDIO_BLK_MODE; #endif @@ -518,7 +527,7 @@ static void ftsdc010_set_clk(struct mmc *mmc) break; } - debug("%s: computed real_rete: %x, clk_div: %x\n", + debug("%s: computed real_rate: %x, clk_div: %x\n", __func__, real_rate, clk_div); if (clk_div > 127) @@ -579,6 +588,7 @@ static void ftsdc010_set_ios(struct mmc *mmc) static void ftsdc010_reset(struct mmc_host *host) { unsigned int timeout; + unsigned int sta; /* Do SDC_RST: Software reset for all register */ writel(FTSDC010_CMD_SDC_RST, &host->reg->cmd); @@ -598,6 +608,10 @@ static void ftsdc010_reset(struct mmc_host *host) timeout--; udelay(10*FTSDC010_DELAY_UNIT); } + + sta = readl(&host->reg->status); + if (sta & FTSDC010_STATUS_CARD_CHANGE) + writel(FTSDC010_CLR_CARD_CHANGE, &host->reg->clr); } static int ftsdc010_core_init(struct mmc *mmc) -- 1.7.3.5

3 9

[U-Boot] CONFIG_BOOTCOUNT_LIMIT
by Sridhar Addagada 22 Dec '11

22 Dec '11

I' need to enable CONFIG_BOOTCOUNT_LIMIT, which is based one MPC8377ERDB, and am looking for recommended address for CONFIG_BOOTCOUNT_ADDR, any suggestions. Thanks S

4 11

[U-Boot] [PATCH] tegra2: Fix out-of-tree build for Ventana.
by Thierry Reding 22 Dec '11

22 Dec '11

Since Ventana is derived from Seaboard and requires seaboard.c to build, make sure board/nvidia/seaboard is created in the build tree. Signed-off-by: Thierry Reding <thierry.reding(a)avionic-design.de> --- board/nvidia/ventana/Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/board/nvidia/ventana/Makefile b/board/nvidia/ventana/Makefile index 9e5a87f..d5140c8 100644 --- a/board/nvidia/ventana/Makefile +++ b/board/nvidia/ventana/Makefile @@ -25,6 +25,7 @@ include $(TOPDIR)/config.mk ifneq ($(OBJTREE),$(SRCTREE)) +$(shell mkdir -p $(obj)../seaboard) $(shell mkdir -p $(obj)../common) endif -- 1.7.7.3

4 8

[U-Boot] [PATCH] arm: Tidy up of PRAM init to use getenv_f()
by Simon Glass 22 Dec '11

22 Dec '11

It seems that few people use CONFIG_PRAM on ARM. The getenv_r() function has been renamed to getenv_f(). Signed-off-by: Simon Glass <sjg(a)chromium.org> --- arch/arm/lib/board.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 1fe3751..653345f 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -317,7 +317,7 @@ void board_init_f(ulong bootflag) /* * reserve protected RAM */ - i = getenv_r("pram", (char *)tmp, sizeof(tmp)); + i = getenv_f("pram", (char *)tmp, sizeof(tmp)); reg = (i > 0) ? simple_strtoul((const char *)tmp, NULL, 10) : CONFIG_PRAM; addr -= (reg << 10); /* size is in kB */ -- 1.7.3.1

2 2

[U-Boot] [PATCH v4 0/5] arm, davinci: add am1808 based enbw_cmc board
by Heiko Schocher 21 Dec '11

21 Dec '11

repost from: [U-Boot] [PATCH v3 0/3] arm, davinci: add am1808 based enbw_cmc board http://lists.denx.de/pipermail/u-boot/2011-November/111427.html changes for v4: - change gp0[15] output state to high - change gp6[10] output state to high add comments from Igor Grinberg: - removed clean, distclean targets from Makefile - sorted includes - aligned table - use misc functions from board/davinci/common moved for this board/davinci/common/misc.c to arch/arm/cpu/arm926ejs/davinci/misc.c in a seperate patch - use da8xx_configure_lpsc_items() add comments from Wolfgang Denk: - return instead continue, if gpio_request fails. Following patches are needed for this patchset - patchset from Christian Riesch: [U-Boot] [PATCH v3 00/15] Add an SPL to boot the da850evm from SPI http://lists.denx.de/pipermail/u-boot/2011-November/111182.html - [U-Boot,1/2] arm, arm926ejs: always do cpu critical inits patchwork.ozlabs.org/patch/124787/ - [U-Boot] arm, fdt: update ethernet mac address before booting Linux http://patchwork.ozlabs.org/patch/114736/ checkpatch: total: 0 errors, 0 warnings, 75 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 20111129/0001-arm-davinci-move-davinci_rtc-struct-to-hardware.h.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 18 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 20111129/0002-arm-davinci-da850-add-uart1-tx-rx-pinmux-config.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 55 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 20111129/0003-arm-board-davinci-common-misc.c-Codingstyle-cleanup.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 48 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 20111129/0004-arm-davinci-move-misc-function-in-arch-tree.patch has no obvious style problems and is ready for submission. total: 0 errors, 0 warnings, 1117 lines checked NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE 20111129/0005-arm-davinci-add-support-for-am1808-based-enbw_cmc-bo.patch has no obvious style problems and is ready for submission. Cc: Paulraj Sandeep <s-paulraj(a)ti.com> Cc: Albert ARIBAUD <albert.u.boot(a)aribaud.net> Cc: Igor Grinberg <grinberg(a)compulab.co.il> Cc: Christian Riesch <christian.riesch(a)omicron.at> Heiko Schocher (5): arm, davinci: move davinci_rtc struct to hardware.h arm, davinci, da850: add uart1 tx rx pinmux config arm, board/davinci/common/misc.c: Codingstyle cleanup arm, davinci: move misc function in arch tree arm, davinci: add support for am1808 based enbw_cmc board MAINTAINERS | 1 + arch/arm/cpu/arm926ejs/davinci/Makefile | 2 +- arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c | 5 + .../arm/cpu/arm926ejs/davinci}/misc.c | 19 +- arch/arm/include/asm/arch-davinci/hardware.h | 39 ++ arch/arm/include/asm/arch-davinci/pinmux_defs.h | 1 + board/ait/cam_enc_4xx/cam_enc_4xx.c | 15 - board/{davinci/common => enbw/enbw_cmc}/Makefile | 12 +- board/enbw/enbw_cmc/enbw_cmc.c | 607 ++++++++++++++++++++ boards.cfg | 1 + drivers/rtc/davinci.c | 26 - include/configs/enbw_cmc.h | 451 +++++++++++++++ nand_spl/board/davinci/da8xxevm/Makefile | 9 +- 13 files changed, 1125 insertions(+), 63 deletions(-) rename {board/davinci/common => arch/arm/cpu/arm926ejs/davinci}/misc.c (90%) rename board/{davinci/common => enbw/enbw_cmc}/Makefile (89%) create mode 100644 board/enbw/enbw_cmc/enbw_cmc.c create mode 100644 include/configs/enbw_cmc.h -- 1.7.6.4

3 9

[U-Boot] [PATCH] CPCI750: Fix GCC 4.6 warning in board/esd/cpci750/mv_eth.c
by Reinhard Arlt 20 Dec '11

20 Dec '11

From: Reinhard Arlt <reinhard.arlt(a)esd.eu> This patch fix the GCC 4.6 warnings in Signed-off-by: Reinhard Arlt <reinhard.arlt(a)esd.eu> -- diff --git a/board/esd/cpci750/mv_eth.c b/board/esd/cpci750/mv_eth.c index 781ad23..69b4a91 100644 --- a/board/esd/cpci750/mv_eth.c +++ b/board/esd/cpci750/mv_eth.c @@ -100,6 +100,8 @@ extern void NetReceive (volatile uchar *, int); extern unsigned int INTERNAL_REG_BASE_ADDR; +u32 port_status; + /************************************************* *Helper functions - used inside the driver only * *************************************************/ @@ -422,7 +424,7 @@ static int mv64360_eth_real_open (struct eth_device *dev) ETH_PORT_INFO *ethernet_private; struct mv64360_eth_priv *port_private; unsigned int port_num; - u32 port_status, phy_reg_data; + u32 phy_reg_data; ethernet_private = (ETH_PORT_INFO *) dev->priv; /* ronen - when we update the MAC env params we only update dev->enetaddr @@ -638,15 +640,6 @@ static int mv64360_eth_free_rx_rings (struct eth_device *dev) int mv64360_eth_stop (struct eth_device *dev) { - ETH_PORT_INFO *ethernet_private; - struct mv64360_eth_priv *port_private; - unsigned int port_num; - - ethernet_private = (ETH_PORT_INFO *) dev->priv; - port_private = - (struct mv64360_eth_priv *) ethernet_private->port_private; - port_num = port_private->port_num; - /* Disable all gigE address decoder */ MV_REG_WRITE (MV64360_ETH_BASE_ADDR_ENABLE_REG, 0x3f); DP (printf ("%s Ethernet stop called ... \n", __FUNCTION__)); @@ -716,7 +709,6 @@ int mv64360_eth_xmit (struct eth_device *dev, volatile void *dataPtr, { ETH_PORT_INFO *ethernet_private; struct mv64360_eth_priv *port_private; - unsigned int port_num; PKT_INFO pkt_info; ETH_FUNC_RET_STATUS status; struct net_device_stats *stats; @@ -725,7 +717,6 @@ int mv64360_eth_xmit (struct eth_device *dev, volatile void *dataPtr, ethernet_private = (ETH_PORT_INFO *) dev->priv; port_private = (struct mv64360_eth_priv *) ethernet_private->port_private; - port_num = port_private->port_num; stats = port_private->stats; @@ -801,7 +792,6 @@ int mv64360_eth_receive (struct eth_device *dev) { ETH_PORT_INFO *ethernet_private; struct mv64360_eth_priv *port_private; - unsigned int port_num; PKT_INFO pkt_info; struct net_device_stats *stats; @@ -809,7 +799,6 @@ int mv64360_eth_receive (struct eth_device *dev) ethernet_private = (ETH_PORT_INFO *) dev->priv; port_private = (struct mv64360_eth_priv *) ethernet_private->port_private; - port_num = port_private->port_num; stats = port_private->stats; while ((eth_port_receive (ethernet_private, ETH_Q0, &pkt_info) == @@ -900,12 +889,10 @@ static struct net_device_stats *mv64360_eth_get_stats (struct eth_device *dev) { ETH_PORT_INFO *ethernet_private; struct mv64360_eth_priv *port_private; - unsigned int port_num; ethernet_private = (ETH_PORT_INFO *) dev->priv; port_private = (struct mv64360_eth_priv *) ethernet_private->port_private; - port_num = port_private->port_num; mv64360_eth_update_stat (dev); @@ -927,24 +914,21 @@ static void mv64360_eth_update_stat (struct eth_device *dev) ETH_PORT_INFO *ethernet_private; struct mv64360_eth_priv *port_private; struct net_device_stats *stats; - unsigned int port_num; - volatile unsigned int dummy; ethernet_private = (ETH_PORT_INFO *) dev->priv; port_private = (struct mv64360_eth_priv *) ethernet_private->port_private; - port_num = port_private->port_num; stats = port_private->stats; /* These are false updates */ stats->rx_packets += (unsigned long) - eth_read_mib_counter (ethernet_private->port_num, - ETH_MIB_GOOD_FRAMES_RECEIVED); + eth_read_mib_counter(ethernet_private->port_num, + ETH_MIB_GOOD_FRAMES_RECEIVED); stats->tx_packets += (unsigned long) - eth_read_mib_counter (ethernet_private->port_num, - ETH_MIB_GOOD_FRAMES_SENT); + eth_read_mib_counter(ethernet_private->port_num, + ETH_MIB_GOOD_FRAMES_SENT); stats->rx_bytes += (unsigned long) - eth_read_mib_counter (ethernet_private->port_num, + eth_read_mib_counter(ethernet_private->port_num, ETH_MIB_GOOD_OCTETS_RECEIVED_LOW); /* * Ideally this should be as follows - @@ -956,41 +940,41 @@ static void mv64360_eth_update_stat (struct eth_device *dev) * But the unsigned long in PowerPC and MIPS are 32bit. So the next read * is just a dummy read for proper work of the GigE port */ - dummy = eth_read_mib_counter (ethernet_private->port_num, + port_status = eth_read_mib_counter(ethernet_private->port_num, ETH_MIB_GOOD_OCTETS_RECEIVED_HIGH); stats->tx_bytes += (unsigned long) - eth_read_mib_counter (ethernet_private->port_num, - ETH_MIB_GOOD_OCTETS_SENT_LOW); - dummy = eth_read_mib_counter (ethernet_private->port_num, - ETH_MIB_GOOD_OCTETS_SENT_HIGH); + eth_read_mib_counter(ethernet_private->port_num, + ETH_MIB_GOOD_OCTETS_SENT_LOW); + port_status = eth_read_mib_counter(ethernet_private->port_num, + ETH_MIB_GOOD_OCTETS_SENT_HIGH); stats->rx_errors += (unsigned long) - eth_read_mib_counter (ethernet_private->port_num, - ETH_MIB_MAC_RECEIVE_ERROR); + eth_read_mib_counter(ethernet_private->port_num, + ETH_MIB_MAC_RECEIVE_ERROR); /* Rx dropped is for received packet with CRC error */ stats->rx_dropped += - (unsigned long) eth_read_mib_counter (ethernet_private-> - port_num, - ETH_MIB_BAD_CRC_EVENT); + (unsigned long) eth_read_mib_counter(ethernet_private-> + port_num, + ETH_MIB_BAD_CRC_EVENT); stats->multicast += (unsigned long) - eth_read_mib_counter (ethernet_private->port_num, - ETH_MIB_MULTICAST_FRAMES_RECEIVED); + eth_read_mib_counter(ethernet_private->port_num, + ETH_MIB_MULTICAST_FRAMES_RECEIVED); stats->collisions += - (unsigned long) eth_read_mib_counter (ethernet_private-> - port_num, - ETH_MIB_COLLISION) + - (unsigned long) eth_read_mib_counter (ethernet_private-> - port_num, - ETH_MIB_LATE_COLLISION); + (unsigned long) eth_read_mib_counter(ethernet_private-> + port_num, + ETH_MIB_COLLISION) + + (unsigned long) eth_read_mib_counter(ethernet_private-> + port_num, + ETH_MIB_LATE_COLLISION); /* detailed rx errors */ stats->rx_length_errors += - (unsigned long) eth_read_mib_counter (ethernet_private-> - port_num, - ETH_MIB_UNDERSIZE_RECEIVED) + (unsigned long) eth_read_mib_counter(ethernet_private-> + port_num, + ETH_MIB_UNDERSIZE_RECEIVED) + - (unsigned long) eth_read_mib_counter (ethernet_private-> - port_num, - ETH_MIB_OVERSIZE_RECEIVED); + (unsigned long) eth_read_mib_counter(ethernet_private-> + port_num, + ETH_MIB_OVERSIZE_RECEIVED); /* detailed tx errors */ } @@ -1009,12 +993,10 @@ static void mv64360_eth_print_stat (struct eth_device *dev) ETH_PORT_INFO *ethernet_private; struct mv64360_eth_priv *port_private; struct net_device_stats *stats; - unsigned int port_num; ethernet_private = (ETH_PORT_INFO *) dev->priv; port_private = (struct mv64360_eth_priv *) ethernet_private->port_private; - port_num = port_private->port_num; stats = port_private->stats; /* These are false updates */ @@ -2066,12 +2048,11 @@ static void eth_port_init_mac_tables (ETH_PORT eth_port_num) static void eth_clear_mib_counters (ETH_PORT eth_port_num) { int i; - unsigned int dummy; /* Perform dummy reads from MIB counters */ for (i = ETH_MIB_GOOD_OCTETS_RECEIVED_LOW; i < ETH_MIB_LATE_COLLISION; i += 4) - dummy = MV_REG_READ ((MV64360_ETH_MIB_COUNTERS_BASE + port_status = MV_REG_READ((MV64360_ETH_MIB_COUNTERS_BASE (eth_port_num) + i)); return;

3 3