diff options
Diffstat (limited to 'board/keymile')
| -rw-r--r-- | board/keymile/common/ivm.c | 2 | ||||
| -rw-r--r-- | board/keymile/km_arm/km_arm.c | 71 | 
2 files changed, 1 insertions, 72 deletions
| diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index 9bc3c21c9..eaa924f0e 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -163,7 +163,7 @@ static int ivm_findinventorystring(int type,  		if (addr == INVENTORYDATASIZE) {  			xcode = -1;  			printf("Error end of string not found\n"); -		} else if ((size >= (maxlen - 1)) && +		} else if ((size > (maxlen - 1)) &&  			   (buf[addr] != '\r')) {  			xcode = -1;  			printf("string too long till next CR\n"); diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 2b2ca3937..be8f51c2f 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -331,26 +331,6 @@ void board_spi_release_bus(struct spi_slave *slave)  	kw_gpio_set_value(KM_FLASH_GPIO_PIN, 1);  } -int dram_init(void) -{ -	/* dram_init must store complete ramsize in gd->ram_size */ -	/* Fix this */ -	gd->ram_size = get_ram_size((void *)kw_sdram_bar(0), -				kw_sdram_bs(0)); -	return 0; -} - -void dram_init_banksize(void) -{ -	int i; - -	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { -		gd->bd->bi_dram[i].start = kw_sdram_bar(i); -		gd->bd->bi_dram[i].size = get_ram_size((long *)kw_sdram_bar(i), -						       kw_sdram_bs(i)); -	} -} -  #if (defined(CONFIG_KM_PIGGY4_88E6061))  #define	PHY_LED_SEL_REG		0x18 @@ -408,57 +388,6 @@ int hush_init_var(void)  }  #endif -#if defined(CONFIG_BOOTCOUNT_LIMIT) -const ulong patterns[]      = {	0x00000000, -				0xFFFFFFFF, -				0xFF00FF00, -				0x0F0F0F0F, -				0xF0F0F0F0}; -const ulong NBR_OF_PATTERNS = ARRAY_SIZE(patterns); -const ulong OFFS_PATTERN    = 3; -const ulong REPEAT_PATTERN  = 1000; - -void bootcount_store(ulong a) -{ -	ulong *save_addr; -	ulong size = 0; -	int i; - -	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) -		size += gd->bd->bi_dram[i].size; -	save_addr = (ulong *)(size - BOOTCOUNT_ADDR); -	writel(a, save_addr); -	writel(BOOTCOUNT_MAGIC, &save_addr[1]); - -	for (i = 0; i < REPEAT_PATTERN; i++) -		writel(patterns[i % NBR_OF_PATTERNS], -			&save_addr[i+OFFS_PATTERN]); - -} - -ulong bootcount_load(void) -{ -	ulong *save_addr; -	ulong size = 0; -	ulong counter = 0; -	int i, tmp; - -	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) -		size += gd->bd->bi_dram[i].size; -	save_addr = (ulong *)(size - BOOTCOUNT_ADDR); - -	counter = readl(&save_addr[0]); - -	/* Is the counter reliable, check in the big pattern for bit errors */ -	for (i = 0; (i < REPEAT_PATTERN) && (counter != 0); i++) { -		tmp = readl(&save_addr[i+OFFS_PATTERN]); -		if (tmp != patterns[i % NBR_OF_PATTERNS]) -			counter = 0; -	} -	return counter; -} -#endif -  #if defined(CONFIG_SOFT_I2C)  void set_sda(int state)  { |