diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/arch_timer.c | 7 | ||||
| -rw-r--r-- | arch/arm/include/asm/emif.h | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/am33xx/ddr.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-sunxi/board.c | 11 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/boot-mode/spl_board.c | 7 | ||||
| -rw-r--r-- | arch/sandbox/cpu/spl.c | 19 |
6 files changed, 17 insertions, 32 deletions
diff --git a/arch/arm/cpu/armv7/arch_timer.c b/arch/arm/cpu/armv7/arch_timer.c index 0588e2baef..30915d28aa 100644 --- a/arch/arm/cpu/armv7/arch_timer.c +++ b/arch/arm/cpu/armv7/arch_timer.c @@ -8,6 +8,7 @@ #include <common.h> #include <asm/io.h> #include <div64.h> +#include <bootstage.h> DECLARE_GLOBAL_DATA_PTR; @@ -17,7 +18,6 @@ int timer_init(void) gd->arch.tbu = 0; gd->arch.timer_rate_hz = CONFIG_SYS_HZ_CLOCK / CONFIG_SYS_HZ; - return 0; } @@ -39,6 +39,11 @@ ulong get_timer(ulong base) return lldiv(get_ticks(), gd->arch.timer_rate_hz) - base; } +ulong timer_get_boot_us(void) +{ + return lldiv(get_ticks(), CONFIG_SYS_HZ_CLOCK / (CONFIG_SYS_HZ * 1000)); +} + void __udelay(unsigned long usec) { unsigned long long endtime; diff --git a/arch/arm/include/asm/emif.h b/arch/arm/include/asm/emif.h index b00decec6d..9a46340deb 100644 --- a/arch/arm/include/asm/emif.h +++ b/arch/arm/include/asm/emif.h @@ -1171,6 +1171,7 @@ struct emif_regs { u32 sdram_tim1; u32 sdram_tim2; u32 sdram_tim3; + u32 ocp_config; u32 read_idle_ctrl; u32 zq_config; u32 temp_alert_config; diff --git a/arch/arm/mach-omap2/am33xx/ddr.c b/arch/arm/mach-omap2/am33xx/ddr.c index 6acf30c5db..690487e7c3 100644 --- a/arch/arm/mach-omap2/am33xx/ddr.c +++ b/arch/arm/mach-omap2/am33xx/ddr.c @@ -180,6 +180,10 @@ void config_sdram(const struct emif_regs *regs, int nr) writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl); writel(regs->ref_ctrl, &emif_reg[nr]->emif_sdram_ref_ctrl_shdw); writel(regs->sdram_config, &emif_reg[nr]->emif_sdram_config); + + /* Write REG_COS_COUNT_1, REG_COS_COUNT_2, and REG_PR_OLD_COUNT. */ + if (regs->ocp_config) + writel(regs->ocp_config, &emif_reg[nr]->emif_l3_config); } /** diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 0f8ead980c..aa11493748 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -142,7 +142,7 @@ static int spl_board_load_image(struct spl_image_info *spl_image, return 0; } -SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_BOARD, spl_board_load_image); +SPL_LOAD_IMAGE_METHOD("FEL", 0, BOOT_DEVICE_BOARD, spl_board_load_image); #endif void s_init(void) @@ -247,15 +247,6 @@ u32 spl_boot_device(void) return -1; /* Never reached */ } -/* - * Properly announce BOOT_DEVICE_BOARD as "FEL". - * Overrides weak function from common/spl/spl.c - */ -void spl_board_announce_boot_device(void) -{ - printf("FEL"); -} - /* No confirmation data available in SPL yet. Hardcode bootmode */ u32 spl_boot_mode(const u32 boot_device) { diff --git a/arch/arm/mach-uniphier/boot-mode/spl_board.c b/arch/arm/mach-uniphier/boot-mode/spl_board.c index 854ab056da..a6b668656b 100644 --- a/arch/arm/mach-uniphier/boot-mode/spl_board.c +++ b/arch/arm/mach-uniphier/boot-mode/spl_board.c @@ -12,11 +12,6 @@ #include "../soc-info.h" -void spl_board_announce_boot_device(void) -{ - printf("eMMC"); -} - struct uniphier_romfunc_table { void *mmc_send_cmd; void *mmc_card_blockaddr; @@ -127,4 +122,4 @@ static int spl_board_load_image(struct spl_image_info *spl_image, return 0; } -SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_BOARD, spl_board_load_image); +SPL_LOAD_IMAGE_METHOD("eMMC", 0, BOOT_DEVICE_BOARD, spl_board_load_image); diff --git a/arch/sandbox/cpu/spl.c b/arch/sandbox/cpu/spl.c index 1ad7fb6c60..7cc76d4cf1 100644 --- a/arch/sandbox/cpu/spl.c +++ b/arch/sandbox/cpu/spl.c @@ -25,19 +25,6 @@ u32 spl_boot_device(void) return BOOT_DEVICE_BOARD; } -void spl_board_announce_boot_device(void) -{ - char fname[256]; - int ret; - - ret = os_find_u_boot(fname, sizeof(fname)); - if (ret) { - printf("(%s not found, error %d)\n", fname, ret); - return; - } - printf("%s\n", fname); -} - static int spl_board_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { @@ -45,13 +32,15 @@ static int spl_board_load_image(struct spl_image_info *spl_image, int ret; ret = os_find_u_boot(fname, sizeof(fname)); - if (ret) + if (ret) { + printf("(%s not found, error %d)\n", fname, ret); return ret; + } /* Hopefully this will not return */ return os_spl_to_uboot(fname); } -SPL_LOAD_IMAGE_METHOD(0, BOOT_DEVICE_BOARD, spl_board_load_image); +SPL_LOAD_IMAGE_METHOD("sandbox", 0, BOOT_DEVICE_BOARD, spl_board_load_image); void spl_board_init(void) { |