[U-Boot] [PATCH 1/3] socfpga: Drop redundant save_boot_params
The save_boot_params function here is the same as the default weak one from arch/arm/cpu/armv7/start.S, drop.
Cc: Dinh Nguyen dinguyen@opensource.altera.com Cc: Vince Bridgers vbridger@opensource.altera.com Cc: Chin Liang See clsee@altera.com Cc: Marek Vasut marex@denx.de Signed-off-by: Tom Rini trini@ti.com --- arch/arm/cpu/armv7/socfpga/lowlevel_init.S | 7 ------- 1 file changed, 7 deletions(-)
diff --git a/arch/arm/cpu/armv7/socfpga/lowlevel_init.S b/arch/arm/cpu/armv7/socfpga/lowlevel_init.S index 2f2e9fc..afed773 100644 --- a/arch/arm/cpu/armv7/socfpga/lowlevel_init.S +++ b/arch/arm/cpu/armv7/socfpga/lowlevel_init.S @@ -7,13 +7,6 @@ #include <config.h> #include <version.h>
-/* Save the parameter pass in by previous boot loader */ -.global save_boot_params -save_boot_params: - /* no parameter to save */ - bx lr - - /* Set up the platform, once the cpu has been initialized */ .globl lowlevel_init lowlevel_init:
In both SPL and non-SPL cases we will make a call to timer_init() early on and do not need to call it again within s_init().
Signed-off-by: Tom Rini trini@ti.com --- arch/arm/cpu/armv7/am33xx/board.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index 29b1d73..eaf09d1 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -294,7 +294,6 @@ void s_init(void) save_omap_boot_params(); #endif watchdog_disable(); - timer_init(); set_uart_mux_conf(); setup_clocks_for_console(); uart_soft_reset();
On 19 December 2014 at 14:52, Tom Rini trini@ti.com wrote:
In both SPL and non-SPL cases we will make a call to timer_init() early on and do not need to call it again within s_init().
Signed-off-by: Tom Rini trini@ti.com
arch/arm/cpu/armv7/am33xx/board.c | 1 - 1 file changed, 1 deletion(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Fri, Dec 19, 2014 at 04:52:54PM -0500, Tom Rini wrote:
In both SPL and non-SPL cases we will make a call to timer_init() early on and do not need to call it again within s_init().
Signed-off-by: Tom Rini trini@ti.com Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
The gd will be cleared at first so we don't need to set arch.tbl to 0. In addition, the checks later against lastinc also work fine with an initial value of 0 here. This also brings us in line with sunxi code for example.
Signed-off-by: Tom Rini trini@ti.com --- arch/arm/cpu/armv7/omap-common/timer.c | 5 ----- 1 file changed, 5 deletions(-)
diff --git a/arch/arm/cpu/armv7/omap-common/timer.c b/arch/arm/cpu/armv7/omap-common/timer.c index 7c9924d..032bd2c 100644 --- a/arch/arm/cpu/armv7/omap-common/timer.c +++ b/arch/arm/cpu/armv7/omap-common/timer.c @@ -41,11 +41,6 @@ int timer_init(void) writel((CONFIG_SYS_PTV << 2) | TCLR_PRE | TCLR_AR | TCLR_ST, &timer_base->tclr);
- /* reset time, capture current incrementer value time */ - gd->arch.lastinc = readl(&timer_base->tcrr) / - (TIMER_CLOCK / CONFIG_SYS_HZ); - gd->arch.tbl = 0; /* start "advancing" time stamp from 0 */ - return 0; }
On 19 December 2014 at 14:52, Tom Rini trini@ti.com wrote:
The gd will be cleared at first so we don't need to set arch.tbl to 0. In addition, the checks later against lastinc also work fine with an initial value of 0 here. This also brings us in line with sunxi code for example.
Signed-off-by: Tom Rini trini@ti.com
arch/arm/cpu/armv7/omap-common/timer.c | 5 ----- 1 file changed, 5 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Fri, Dec 19, 2014 at 04:52:55PM -0500, Tom Rini wrote:
The gd will be cleared at first so we don't need to set arch.tbl to 0. In addition, the checks later against lastinc also work fine with an initial value of 0 here. This also brings us in line with sunxi code for example.
Signed-off-by: Tom Rini trini@ti.com Reviewed-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
On Friday, December 19, 2014 at 10:52:53 PM, Tom Rini wrote:
The save_boot_params function here is the same as the default weak one from arch/arm/cpu/armv7/start.S, drop.
Cc: Dinh Nguyen dinguyen@opensource.altera.com Cc: Vince Bridgers vbridger@opensource.altera.com Cc: Chin Liang See clsee@altera.com Cc: Marek Vasut marex@denx.de Signed-off-by: Tom Rini trini@ti.com
Reviewed-by: Marek Vasut marex@denx.de
Best regards, Marek Vasut
On Fri, Dec 19, 2014 at 04:52:53PM -0500, Tom Rini wrote:
The save_boot_params function here is the same as the default weak one from arch/arm/cpu/armv7/start.S, drop.
Cc: Dinh Nguyen dinguyen@opensource.altera.com Cc: Vince Bridgers vbridger@opensource.altera.com Cc: Chin Liang See clsee@altera.com Cc: Marek Vasut marex@denx.de Signed-off-by: Tom Rini trini@ti.com Reviewed-by: Marek Vasut marex@denx.de
Applied to u-boot/master, thanks!
participants (3)
-
Marek Vasut -
Simon Glass -
Tom Rini