July 2014 - U-Boot

[U-Boot] [PATCH 0/4] Introducing the Broadcom Cygnus and NSP boards.
by Steve Rae 22 Jul '14

22 Jul '14

This series adds the bcm958300k and the bcm958622hr boards which share the iproc architecture code. Scott Branden (4): arm: iproc: Initial commit of iproc architecture code arm: bcmcygnus: Add bcmcygnus u-architecture arm: bcmnsp: Add bcmnsp u-architecture arm: add Cygnus and NSP boards arch/arm/cpu/armv7/Makefile | 1 + arch/arm/cpu/armv7/bcmcygnus/Makefile | 7 + arch/arm/cpu/armv7/bcmcygnus/reset.c | 20 +++ arch/arm/cpu/armv7/bcmnsp/Makefile | 7 + arch/arm/cpu/armv7/bcmnsp/reset.c | 19 +++ arch/arm/cpu/armv7/iproc-common/Makefile | 9 ++ arch/arm/cpu/armv7/iproc-common/armpll.c | 170 ++++++++++++++++++++++++ arch/arm/cpu/armv7/iproc-common/hwinit-common.c | 16 +++ arch/arm/cpu/armv7/iproc-common/timer.c | 130 ++++++++++++++++++ arch/arm/include/asm/arch-bcmcygnus/configs.h | 25 ++++ arch/arm/include/asm/arch-bcmnsp/configs.h | 22 +++ arch/arm/include/asm/iproc-common/armpll.h | 14 ++ arch/arm/include/asm/iproc-common/configs.h | 20 +++ arch/arm/include/asm/iproc-common/sysmap.h | 47 +++++++ arch/arm/include/asm/iproc-common/timer.h | 37 ++++++ board/broadcom/bcm_ep/Makefile | 7 + board/broadcom/bcm_ep/board.c | 62 +++++++++ boards.cfg | 2 + include/configs/bcm_ep_board.h | 111 ++++++++++++++++ 19 files changed, 726 insertions(+) create mode 100644 arch/arm/cpu/armv7/bcmcygnus/Makefile create mode 100644 arch/arm/cpu/armv7/bcmcygnus/reset.c create mode 100644 arch/arm/cpu/armv7/bcmnsp/Makefile create mode 100644 arch/arm/cpu/armv7/bcmnsp/reset.c create mode 100644 arch/arm/cpu/armv7/iproc-common/Makefile create mode 100644 arch/arm/cpu/armv7/iproc-common/armpll.c create mode 100644 arch/arm/cpu/armv7/iproc-common/hwinit-common.c create mode 100644 arch/arm/cpu/armv7/iproc-common/timer.c create mode 100644 arch/arm/include/asm/arch-bcmcygnus/configs.h create mode 100644 arch/arm/include/asm/arch-bcmnsp/configs.h create mode 100644 arch/arm/include/asm/iproc-common/armpll.h create mode 100644 arch/arm/include/asm/iproc-common/configs.h create mode 100644 arch/arm/include/asm/iproc-common/sysmap.h create mode 100644 arch/arm/include/asm/iproc-common/timer.h create mode 100644 board/broadcom/bcm_ep/Makefile create mode 100644 board/broadcom/bcm_ep/board.c create mode 100644 include/configs/bcm_ep_board.h -- 1.8.5

2 8

[U-Boot] [PATCH] driver/mtd: Use generic timer API for FSL IFC, eLBC
by Prabhakar Kushwaha 21 Jul '14

21 Jul '14

Freescale's flash control driver is using architecture specific timer API i.e. usec2ticks Replace usec2ticks with get_timer() (generic timer API) Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> --- drivers/mtd/nand/fsl_elbc_nand.c | 8 ++++---- drivers/mtd/nand/fsl_ifc_nand.c | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c index 2f31fc9..58b55cb 100644 --- a/drivers/mtd/nand/fsl_elbc_nand.c +++ b/drivers/mtd/nand/fsl_elbc_nand.c @@ -37,7 +37,6 @@ #define MAX_BANKS 8 #define ERR_BYTE 0xFF /* Value returned for read bytes when read failed */ -#define FCM_TIMEOUT_MSECS 10 /* Maximum number of mSecs to wait for FCM */ #define LTESR_NAND_MASK (LTESR_FCT | LTESR_PAR | LTESR_CC) @@ -199,7 +198,8 @@ static int fsl_elbc_run_command(struct mtd_info *mtd) struct fsl_elbc_mtd *priv = chip->priv; struct fsl_elbc_ctrl *ctrl = priv->ctrl; fsl_lbc_t *lbc = ctrl->regs; - long long end_tick; + u32 timeo = (CONFIG_SYS_HZ * 10) / 1000; + u32 time_start; u32 ltesr; /* Setup the FMR[OP] to execute without write protection */ @@ -218,10 +218,10 @@ static int fsl_elbc_run_command(struct mtd_info *mtd) out_be32(&lbc->lsor, priv->bank); /* wait for FCM complete flag or timeout */ - end_tick = usec2ticks(FCM_TIMEOUT_MSECS * 1000) + get_ticks(); + time_start = get_timer(0); ltesr = 0; - while (end_tick > get_ticks()) { + while (get_timer(time_start) < timeo) { ltesr = in_be32(&lbc->ltesr); if (ltesr & LTESR_CC) break; diff --git a/drivers/mtd/nand/fsl_ifc_nand.c b/drivers/mtd/nand/fsl_ifc_nand.c index 8b453cb..6c158f5 100644 --- a/drivers/mtd/nand/fsl_ifc_nand.c +++ b/drivers/mtd/nand/fsl_ifc_nand.c @@ -26,8 +26,6 @@ #define MAX_BANKS CONFIG_SYS_FSL_IFC_BANK_COUNT #define ERR_BYTE 0xFF /* Value returned for read bytes when read failed */ -#define IFC_TIMEOUT_MSECS 10 /* Maximum number of mSecs to wait for IFC - NAND Machine */ struct fsl_ifc_ctrl; @@ -292,7 +290,8 @@ static int fsl_ifc_run_command(struct mtd_info *mtd) struct fsl_ifc_mtd *priv = chip->priv; struct fsl_ifc_ctrl *ctrl = priv->ctrl; struct fsl_ifc *ifc = ctrl->regs; - long long end_tick; + u32 timeo = (CONFIG_SYS_HZ * 20) / 1000; + u32 time_start; u32 eccstat[4]; int i; @@ -304,9 +303,9 @@ static int fsl_ifc_run_command(struct mtd_info *mtd) IFC_NAND_SEQ_STRT_FIR_STRT); /* wait for NAND Machine complete flag or timeout */ - end_tick = usec2ticks(IFC_TIMEOUT_MSECS * 1000) + get_ticks(); + time_start = get_timer(0); - while (end_tick > get_ticks()) { + while (get_timer(time_start) < timeo) { ctrl->status = ifc_in32(&ifc->ifc_nand.nand_evter_stat); if (ctrl->status & IFC_NAND_EVTER_STAT_OPC) @@ -810,15 +809,16 @@ static int fsl_ifc_sram_init(uint32_t ver) struct fsl_ifc *ifc = ifc_ctrl->regs; uint32_t cs = 0, csor = 0, csor_8k = 0, csor_ext = 0; uint32_t ncfgr = 0; - long long end_tick; + u32 timeo = (CONFIG_SYS_HZ * 20) / 1000; + u32 time_start; if (ver > FSL_IFC_V1_1_0) { ncfgr = ifc_in32(&ifc->ifc_nand.ncfgr); ifc_out32(&ifc->ifc_nand.ncfgr, ncfgr | IFC_NAND_SRAM_INIT_EN); /* wait for SRAM_INIT bit to be clear or timeout */ - end_tick = usec2ticks(IFC_TIMEOUT_MSECS * 1000) + get_ticks(); - while (end_tick > get_ticks()) { + time_start = get_timer(0); + while (get_timer(time_start) < timeo) { ifc_ctrl->status = ifc_in32(&ifc->ifc_nand.nand_evter_stat); @@ -861,10 +861,9 @@ static int fsl_ifc_sram_init(uint32_t ver) /* start read seq */ ifc_out32(&ifc->ifc_nand.nandseq_strt, IFC_NAND_SEQ_STRT_FIR_STRT); - /* wait for NAND Machine complete flag or timeout */ - end_tick = usec2ticks(IFC_TIMEOUT_MSECS * 1000) + get_ticks(); + time_start = get_timer(0); - while (end_tick > get_ticks()) { + while (get_timer(time_start) < timeo) { ifc_ctrl->status = ifc_in32(&ifc->ifc_nand.nand_evter_stat); if (ifc_ctrl->status & IFC_NAND_EVTER_STAT_OPC) -- 1.7.9.5

2 1

[U-Boot] [PATCH] esd:cmd_loadpci.c: Switch from "do_source" to "source"
by Tom Rini 21 Jul '14

21 Jul '14

Rather than calling do_source directly (which is not officially exported from cmd_source.c) call 'source' which is exported and requires a little less code to do so as well. Signed-off-by: Tom Rini <trini(a)ti.com> --- board/esd/common/cmd_loadpci.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/board/esd/common/cmd_loadpci.c b/board/esd/common/cmd_loadpci.c index 803179a..95d1891 100644 --- a/board/esd/common/cmd_loadpci.c +++ b/board/esd/common/cmd_loadpci.c @@ -12,9 +12,6 @@ #endif #if defined(CONFIG_CMD_BSP) - -extern int do_source (cmd_tbl_t *, int, int, char *[]); - #define ADDRMASK 0xfffff000 /* @@ -27,7 +24,6 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) int count2 = 0; char addr[16]; char str[] = "\\|/-"; - char *local_args[2]; u32 la, ptm1la; #if defined(CONFIG_440) @@ -84,9 +80,7 @@ int do_loadpci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * Boot image via "source" command */ printf("executing script at addr 0x%s ...\n", addr); - local_args[0] = addr; - local_args[1] = NULL; - do_source(cmdtp, 0, 1, local_args); + source(la, NULL); break; case 2: -- 1.7.9.5

1 1

[U-Boot] [i2c] Pull request
by Heiko Schocher 21 Jul '14

21 Jul '14

Hello Tom, please pull from u-boot-i2c.git The following changes since commit 524123a70761110c5cf3ccc5f52f6d4da071b959: Prepare v2014.07 (2014-07-14 13:16:45 -0400) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to a17fd10fb516df3a0b00fcceb8678de2689951fc: fsl_i2c: add support for 3rd and 4th I2C (2014-07-16 05:19:15 +0200) ---------------------------------------------------------------- Heiko Schocher (1): i2c, omap24xx: add i2c deblock sequenz Shengzhou Liu (1): fsl_i2c: add support for 3rd and 4th I2C drivers/i2c/fsl_i2c.c | 22 ++++++++++++++++++++-- drivers/i2c/omap24xx_i2c.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 2 deletions(-) Thanks! bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

3 4

[U-Boot] [PATCH] common: cmd_mii: fix printf format warning
by Jeroen Hofstee 21 Jul '14

21 Jul '14

The and operator implicitly upcasts the value to int, hence the format should expect an int type as well. (and make checkpatch happy) Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- fixes clang warning: common/cmd_mii.c:165:4: warning: format specifies type 'unsigned short' but the argument has type 'int' [-Wformat] regval & mask_in_place, ^~~~~~~~~~~~~~~~~~~~~~ --- common/cmd_mii.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/cmd_mii.c b/common/cmd_mii.c index b82a7ce..7c4a57a 100644 --- a/common/cmd_mii.c +++ b/common/cmd_mii.c @@ -160,10 +160,10 @@ static void dump_reg( mask_in_place = pdesc->mask << pdesc->lo; - printf(" (%04hx:%04hx) %u.", - mask_in_place, - regval & mask_in_place, - prd->regno); + printf(" (%04hx:%04x) %u.", + mask_in_place, + regval & mask_in_place, + prd->regno); if (special_field(prd->regno, pdesc, regval)) { } -- 1.8.3.2

2 1

[U-Boot] [PATCH] autoboot: add its own header
by Jeroen Hofstee 21 Jul '14

21 Jul '14

Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- common/autoboot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/common/autoboot.c b/common/autoboot.c index 30102a4..c27cc2c 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <autoboot.h> #include <bootretry.h> #include <cli.h> #include <fdtdec.h> -- 1.8.3.2

2 1

[U-Boot] [PATCH] board: rpi_b: include mmc header and fix prototype
by Jeroen Hofstee 21 Jul '14

21 Jul '14

cc: Stephen Warren <swarren(a)wwwdotorg.org> Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- board/raspberrypi/rpi_b/rpi_b.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/board/raspberrypi/rpi_b/rpi_b.c b/board/raspberrypi/rpi_b/rpi_b.c index f33fae9..601c6f7 100644 --- a/board/raspberrypi/rpi_b/rpi_b.c +++ b/board/raspberrypi/rpi_b/rpi_b.c @@ -17,6 +17,7 @@ #include <common.h> #include <config.h> #include <lcd.h> +#include <mmc.h> #include <asm/arch/mbox.h> #include <asm/arch/sdhci.h> #include <asm/global_data.h> @@ -91,7 +92,7 @@ int board_init(void) return power_on_module(BCM2835_MBOX_POWER_DEVID_USB_HCD); } -int board_mmc_init(void) +int board_mmc_init(bd_t *bis) { ALLOC_ALIGN_BUFFER(struct msg_get_clock_rate, msg_clk, 1, 16); int ret; -- 1.8.3.2

2 2

[U-Boot] [PATCH] mmc: prevent some warnings with make W=1
by Jeroen Hofstee 21 Jul '14

21 Jul '14

Add missing prototypes for global functions and make local functions static. cc: panto(a)antoniou-consulting.com Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- drivers/mmc/mmc.c | 6 +++--- drivers/mmc/omap_hsmmc.c | 2 +- include/mmc.h | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index b5477b1..50de02f 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -21,7 +21,7 @@ static struct list_head mmc_devices; static int cur_dev_num = -1; -int __weak board_mmc_getwp(struct mmc *mmc) +__weak int board_mmc_getwp(struct mmc *mmc) { return -1; } @@ -377,7 +377,7 @@ static int mmc_send_op_cond_iter(struct mmc *mmc, struct mmc_cmd *cmd, return 0; } -int mmc_send_op_cond(struct mmc *mmc) +static int mmc_send_op_cond(struct mmc *mmc) { struct mmc_cmd cmd; int err, i; @@ -399,7 +399,7 @@ int mmc_send_op_cond(struct mmc *mmc) return IN_PROGRESS; } -int mmc_complete_op_cond(struct mmc *mmc) +static int mmc_complete_op_cond(struct mmc *mmc) { struct mmc_cmd cmd; int timeout = 1000; diff --git a/drivers/mmc/omap_hsmmc.c b/drivers/mmc/omap_hsmmc.c index 17cbb09..5b0c302 100644 --- a/drivers/mmc/omap_hsmmc.c +++ b/drivers/mmc/omap_hsmmc.c @@ -120,7 +120,7 @@ static void omap5_pbias_config(struct mmc *mmc) } #endif -unsigned char mmc_board_init(struct mmc *mmc) +static unsigned char mmc_board_init(struct mmc *mmc) { #if defined(CONFIG_OMAP34XX) t2_t *t2_base = (t2_t *)T2_BASE; diff --git a/include/mmc.h b/include/mmc.h index f46572e..7f5f9bc 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -327,10 +327,11 @@ struct mmc *find_mmc_device(int dev_num); int mmc_set_dev(int dev_num); void print_mmc_devices(char separator); int get_mmc_num(void); -int board_mmc_getcd(struct mmc *mmc); int mmc_switch_part(int dev_num, unsigned int part_num); int mmc_getcd(struct mmc *mmc); +int board_mmc_getcd(struct mmc *mmc); int mmc_getwp(struct mmc *mmc); +int board_mmc_getwp(struct mmc *mmc); int mmc_set_dsr(struct mmc *mmc, u16 val); /* Function to change the size of boot partition and rpmb partitions */ int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize, @@ -385,6 +386,7 @@ int mmc_legacy_init(int verbose); #endif int board_mmc_init(bd_t *bis); +int cpu_mmc_init(bd_t *bis); /* Set block count limit because of 16 bit register limit on some hardware*/ #ifndef CONFIG_SYS_MMC_MAX_BLK_COUNT -- 1.8.3.2

2 1

[U-Boot] [PATCH] common: env_common: make env_get_char_spec __weak
by Jeroen Hofstee 21 Jul '14

21 Jul '14

--- yup another clang warning: common/env_common.c:30:14: warning: unused function '__env_get_char_spec' [-Wunused-function] static uchar __env_get_char_spec(int index) ^ --- common/env_common.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common/env_common.c b/common/env_common.c index cd7b4cd..3b979bc 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -27,12 +27,10 @@ struct hsearch_data env_htab = { .change_ok = env_flags_validate, }; -static uchar __env_get_char_spec(int index) +__weak uchar env_get_char_spec(int index) { return *((uchar *)(gd->env_addr + index)); } -uchar env_get_char_spec(int) - __attribute__((weak, alias("__env_get_char_spec"))); static uchar env_get_char_init(int index) { -- 1.8.3.2

4 6

[U-Boot] [PATCH 0/2] yaffs2: fix clang warnings and small cleanup
by Jeroen Hofstee 21 Jul '14

21 Jul '14

ignores checkpatch warning: CHECK: if this code is redundant consider removing it #120: FILE: fs/yaffs2/yaffsfs.c:3186: +#if 0 since this was already in u-boot. Jeroen Hofstee (2): yaffs2: cosmetic: remove self assignments yaffs2: preprocessor cleanup fs/yaffs2/yaffs_guts.c | 32 ++++++++++---------------------- fs/yaffs2/yaffs_verify.c | 4 ---- fs/yaffs2/yaffsfs.c | 8 +------- 3 files changed, 11 insertions(+), 33 deletions(-) -- 1.8.3.2

2 8