projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Drop linux/delay.h from common header
[platform/kernel/u-boot.git]
/
include
/
configs
/
km
/
km_arm.h
diff --git
a/include/configs/km/km_arm.h
b/include/configs/km/km_arm.h
index
829a5c7
..
79edfa7
100644
(file)
--- a/
include/configs/km/km_arm.h
+++ b/
include/configs/km/km_arm.h
@@
-37,8
+37,6
@@
#include "asm/arch/config.h"
#include "asm/arch/config.h"
-#define CONFIG_SYS_MEMTEST_START 0x00400000 /* 4M */
-#define CONFIG_SYS_MEMTEST_END 0x007fffff /*(_8M -1) */
#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */
/* architecture specific default bootargs */
#define CONFIG_SYS_LOAD_ADDR 0x00800000 /* default load adr- 8M */
/* architecture specific default bootargs */
@@
-106,6
+104,8
@@
#ifndef __ASSEMBLY__
#include <asm/arch/gpio.h>
#ifndef __ASSEMBLY__
#include <asm/arch/gpio.h>
+#include <linux/delay.h>
+#include <linux/stringify.h>
extern void __set_direction(unsigned pin, int high);
void set_sda(int state);
void set_scl(int state);
extern void __set_direction(unsigned pin, int high);
void set_sda(int state);
void set_scl(int state);
@@
-141,25
+141,14
@@
int get_scl(void);
* Environment variables configurations
*/
#if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
* Environment variables configurations
*/
#if defined CONFIG_KM_ENV_IS_IN_SPI_NOR
-#define CONFIG_ENV_OFFSET 0xc0000 /* no bracets! */
-#define CONFIG_ENV_SIZE 0x02000 /* Size of Environment */
-#define CONFIG_ENV_SECT_SIZE 0x10000
-#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + \
- CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_TOTAL_SIZE 0x20000 /* no bracets! */
#else
#define CONFIG_SYS_DEF_EEPROM_ADDR 0x50
#define CONFIG_ENV_EEPROM_IS_ON_I2C
#define CONFIG_SYS_EEPROM_WREN
#define CONFIG_ENV_TOTAL_SIZE 0x20000 /* no bracets! */
#else
#define CONFIG_SYS_DEF_EEPROM_ADDR 0x50
#define CONFIG_ENV_EEPROM_IS_ON_I2C
#define CONFIG_SYS_EEPROM_WREN
-#define CONFIG_ENV_OFFSET 0x0 /* no bracets! */
-#define CONFIG_ENV_SIZE (0x2000 - CONFIG_ENV_OFFSET)
#define CONFIG_I2C_ENV_EEPROM_BUS 5 /* I2C2 (Mux-Port 5) */
#define CONFIG_I2C_ENV_EEPROM_BUS 5 /* I2C2 (Mux-Port 5) */
-#define CONFIG_ENV_OFFSET_REDUND 0x2000 /* no bracets! */
-#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#endif
#endif
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-
#define KM_FLASH_GPIO_PIN 16
#define CONFIG_KM_UPDATE_UBOOT \
#define KM_FLASH_GPIO_PIN 16
#define CONFIG_KM_UPDATE_UBOOT \