Patchwork [U-Boot,v1,20/25] arm: kirkwood: Remove some dead code from cpu.c

login
register
mail settings
Submitter Stefan Roese
Date June 27, 2014, 9:55 a.m.
Message ID <1403862911-6138-21-git-send-email-sr@denx.de>
Download mbox | patch
Permalink /patch/364840/
State New
Delegated to: Prafulla Wadaskar
Headers show

Comments

Stefan Roese - June 27, 2014, 9:55 a.m.
All those functions removed with this patch are not accessed at all. So lets
remove them.

Signed-off-by: Stefan Roese <sr@denx.de>
---

 arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 55 -----------------------------------
 1 file changed, 55 deletions(-)
Luka Perkov - July 1, 2014, 11:45 p.m.
On Fri, Jun 27, 2014 at 11:55:06AM +0200, Stefan Roese wrote:
> All those functions removed with this patch are not accessed at all. So lets
> remove them.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
> 
>  arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 55 -----------------------------------
>  1 file changed, 55 deletions(-)

Up until this patch I have tested the series without problems on ib62x0.
This is the last patch that I can apply and still boot the board. That
said, for this patch and those before it:

Tested-by: Luka Perkov <luka@openwrt.org>


After the next patch in series is applied uboot does not come up - there
is no output on the console. I've used kwboot in testing:

$ sudo ./tools/kwboot -t -p -B 115200 -b u-boot.kwb /dev/ttyUSB0

Unrelated to this series I am going to mail a couple of kirkwood
patches. Those can be applied without conflicts before or after this
series.

Luka

Patch

diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
index 00abcfd..c384565 100644
--- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
+++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
@@ -9,13 +9,10 @@ 
 #include <common.h>
 #include <netdev.h>
 #include <asm/cache.h>
-#include <u-boot/md5.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/soc.h>
 
-#define BUFLEN	16
-
 void reset_cpu(unsigned long ignored)
 {
 	struct kwcpu_registers *cpureg =
@@ -29,31 +26,6 @@  void reset_cpu(unsigned long ignored)
 }
 
 /*
- * Generates Ramdom hex number reading some time varient system registers
- * and using md5 algorithm
- */
-unsigned char get_random_hex(void)
-{
-	int i;
-	u32 inbuf[BUFLEN];
-	u8 outbuf[BUFLEN];
-
-	/*
-	 * in case of 88F6281/88F6282/88F6192 A0,
-	 * Bit7 need to reset to generate random values in KW_REG_UNDOC_0x1470
-	 * Soc reg offsets KW_REG_UNDOC_0x1470 and KW_REG_UNDOC_0x1478 are
-	 * reserved regs and does not have names at this moment
-	 * (no errata available)
-	 */
-	writel(readl(KW_REG_UNDOC_0x1478) & ~(1 << 7), KW_REG_UNDOC_0x1478);
-	for (i = 0; i < BUFLEN; i++) {
-		inbuf[i] = readl(KW_REG_UNDOC_0x1470);
-	}
-	md5((u8 *) inbuf, (BUFLEN * sizeof(u32)), outbuf);
-	return outbuf[outbuf[7] % 0x0f];
-}
-
-/*
  * Window Size
  * Used with the Base register to set the address window size and location.
  * Must be programmed from LSB to MSB as sequence of ones followed by
@@ -139,33 +111,6 @@  int kw_config_adr_windows(void)
 }
 
 /*
- * kw_config_mpp - Multi-Purpose Pins Functionality configuration
- *
- * Each MPP can be configured to different functionality through
- * MPP control register, ref (sec 6.1 of kirkwood h/w specification)
- *
- * There are maximum 64 Multi-Pourpose Pins on Kirkwood
- * Each MPP functionality can be configuration by a 4bit value
- * of MPP control reg, the value and associated functionality depends
- * upon used SoC varient
- */
-int kw_config_mpp(u32 mpp0_7, u32 mpp8_15, u32 mpp16_23, u32 mpp24_31,
-		u32 mpp32_39, u32 mpp40_47, u32 mpp48_55)
-{
-	u32 *mppreg = (u32 *) KW_MPP_BASE;
-
-	/* program mpp registers */
-	writel(mpp0_7, &mppreg[0]);
-	writel(mpp8_15, &mppreg[1]);
-	writel(mpp16_23, &mppreg[2]);
-	writel(mpp24_31, &mppreg[3]);
-	writel(mpp32_39, &mppreg[4]);
-	writel(mpp40_47, &mppreg[5]);
-	writel(mpp48_55, &mppreg[6]);
-	return 0;
-}
-
-/*
  * SYSRSTn Duration Counter Support
  *
  * Kirkwood SoC implements a hardware-based SYSRSTn duration counter.