diff options
Diffstat (limited to 'post/drivers')
| -rw-r--r-- | post/drivers/flash.c | 14 | ||||
| -rw-r--r-- | post/drivers/i2c.c | 20 | ||||
| -rw-r--r-- | post/drivers/memory.c | 6 | ||||
| -rw-r--r-- | post/drivers/rtc.c | 4 |
4 files changed, 22 insertions, 22 deletions
diff --git a/post/drivers/flash.c b/post/drivers/flash.c index 7d65f46d9fe..a1fcf1f135d 100644 --- a/post/drivers/flash.c +++ b/post/drivers/flash.c @@ -6,7 +6,7 @@ * Licensed under the GPL-2 or later. */ -#if CONFIG_POST & CONFIG_SYS_POST_FLASH +#if CFG_POST & CFG_SYS_POST_FLASH #include <common.h> #include <malloc.h> #include <post.h> @@ -23,10 +23,10 @@ * - better seed pattern than 0x00..0xff */ -#ifndef CONFIG_SYS_POST_FLASH_NUM -# define CONFIG_SYS_POST_FLASH_NUM 0 +#ifndef CFG_SYS_POST_FLASH_NUM +# define CFG_SYS_POST_FLASH_NUM 0 #endif -#if CONFIG_SYS_POST_FLASH_START >= CONFIG_SYS_POST_FLASH_END +#if CFG_SYS_POST_FLASH_START >= CFG_SYS_POST_FLASH_END # error "invalid flash block start/end" #endif @@ -59,9 +59,9 @@ int flash_post_test(int flags) len = 0; src = NULL; - info = &flash_info[CONFIG_SYS_POST_FLASH_NUM]; - n_start = CONFIG_SYS_POST_FLASH_START; - n_end = CONFIG_SYS_POST_FLASH_END; + info = &flash_info[CFG_SYS_POST_FLASH_NUM]; + n_start = CFG_SYS_POST_FLASH_START; + n_end = CFG_SYS_POST_FLASH_END; for (n = n_start; n < n_end; ++n) { ulong s_start, s_len, s_off; diff --git a/post/drivers/i2c.c b/post/drivers/i2c.c index 3b378921faf..557d6329a4f 100644 --- a/post/drivers/i2c.c +++ b/post/drivers/i2c.c @@ -9,14 +9,14 @@ * * For verifying the I2C bus, a full I2C bus scanning is performed. * - * #ifdef CONFIG_SYS_POST_I2C_ADDRS + * #ifdef CFG_SYS_POST_I2C_ADDRS * The test is considered as passed if all the devices and only the devices * in the list are found. - * #ifdef CONFIG_SYS_POST_I2C_IGNORES - * Ignore devices listed in CONFIG_SYS_POST_I2C_IGNORES. These devices + * #ifdef CFG_SYS_POST_I2C_IGNORES + * Ignore devices listed in CFG_SYS_POST_I2C_IGNORES. These devices * are optional or not vital to board functionality. * #endif - * #else [ ! CONFIG_SYS_POST_I2C_ADDRS ] + * #else [ ! CFG_SYS_POST_I2C_ADDRS ] * The test is considered as passed if any I2C device is found. * #endif */ @@ -26,12 +26,12 @@ #include <post.h> #include <i2c.h> -#if CONFIG_POST & CONFIG_SYS_POST_I2C +#if CFG_POST & CFG_SYS_POST_I2C static int i2c_ignore_device(unsigned int chip) { -#ifdef CONFIG_SYS_POST_I2C_IGNORES - const unsigned char i2c_ignore_list[] = CONFIG_SYS_POST_I2C_IGNORES; +#ifdef CFG_SYS_POST_I2C_IGNORES + const unsigned char i2c_ignore_list[] = CFG_SYS_POST_I2C_IGNORES; int i; for (i = 0; i < sizeof(i2c_ignore_list); i++) @@ -45,7 +45,7 @@ static int i2c_ignore_device(unsigned int chip) int i2c_post_test (int flags) { unsigned int i; -#ifndef CONFIG_SYS_POST_I2C_ADDRS +#ifndef CFG_SYS_POST_I2C_ADDRS /* Start at address 1, address 0 is the general call address */ for (i = 1; i < 128; i++) { if (i2c_ignore_device(i)) @@ -59,7 +59,7 @@ int i2c_post_test (int flags) #else unsigned int ret = 0; int j; - unsigned char i2c_addr_list[] = CONFIG_SYS_POST_I2C_ADDRS; + unsigned char i2c_addr_list[] = CFG_SYS_POST_I2C_ADDRS; /* Start at address 1, address 0 is the general call address */ for (i = 1; i < 128; i++) { @@ -94,4 +94,4 @@ int i2c_post_test (int flags) #endif } -#endif /* CONFIG_POST & CONFIG_SYS_POST_I2C */ +#endif /* CFG_POST & CFG_SYS_POST_I2C */ diff --git a/post/drivers/memory.c b/post/drivers/memory.c index d249942af06..1be2b41df45 100644 --- a/post/drivers/memory.c +++ b/post/drivers/memory.c @@ -138,7 +138,7 @@ #include <post.h> #include <watchdog.h> -#if CONFIG_POST & (CONFIG_SYS_POST_MEMORY | CONFIG_SYS_POST_MEM_REGIONS) +#if CFG_POST & (CFG_SYS_POST_MEMORY | CFG_SYS_POST_MEM_REGIONS) DECLARE_GLOBAL_DATA_PTR; @@ -467,7 +467,7 @@ int arch_memory_test_prepare(u32 *vstart, u32 *size, phys_addr_t *phys_offset) { struct bd_info *bd = gd->bd; - *vstart = CONFIG_SYS_SDRAM_BASE; + *vstart = CFG_SYS_SDRAM_BASE; *size = (gd->ram_size >= 256 << 20 ? 256 << 20 : gd->ram_size) - (1 << 20); @@ -535,4 +535,4 @@ int memory_post_test(int flags) return ret; } -#endif /* CONFIG_POST&(CONFIG_SYS_POST_MEMORY|CONFIG_SYS_POST_MEM_REGIONS) */ +#endif /* CFG_POST&(CFG_SYS_POST_MEMORY|CFG_SYS_POST_MEM_REGIONS) */ diff --git a/post/drivers/rtc.c b/post/drivers/rtc.c index c603f0e6728..cc7a49847cc 100644 --- a/post/drivers/rtc.c +++ b/post/drivers/rtc.c @@ -26,7 +26,7 @@ #include <post.h> #include <rtc.h> -#if CONFIG_POST & CONFIG_SYS_POST_RTC +#if CFG_POST & CFG_SYS_POST_RTC static int rtc_post_skip (ulong * diff) { @@ -189,4 +189,4 @@ int rtc_post_test (int flags) return 0; } -#endif /* CONFIG_POST & CONFIG_SYS_POST_RTC */ +#endif /* CFG_POST & CFG_SYS_POST_RTC */ |