aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/board_f.c4
-rw-r--r--common/board_r.c8
-rw-r--r--common/spl/Kconfig.nxp4
-rw-r--r--common/spl/spl.c6
-rw-r--r--common/spl/spl_fit.c2
-rw-r--r--common/spl/spl_nor.c2
-rw-r--r--common/spl/spl_spi.c8
-rw-r--r--common/spl/spl_ubi.c2
-rw-r--r--common/spl/spl_xip.c2
9 files changed, 19 insertions, 19 deletions
diff --git a/common/board_f.c b/common/board_f.c
index aab1130..e027248 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -900,9 +900,9 @@ static const init_fnc_t init_sequence_f[] = {
post_init_f,
#endif
INIT_FUNC_WATCHDOG_RESET
-#if defined(CONFIG_SYS_DRAM_TEST)
+#if defined(CFG_SYS_DRAM_TEST)
testdram,
-#endif /* CONFIG_SYS_DRAM_TEST */
+#endif /* CFG_SYS_DRAM_TEST */
INIT_FUNC_WATCHDOG_RESET
#ifdef CONFIG_POST
diff --git a/common/board_r.c b/common/board_r.c
index f7fb7df..347bb7f 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -346,7 +346,7 @@ static int initr_flash(void)
* NOTE: Maybe we should add some schedule()? XXX
*/
if (env_get_yesno("flashchecksum") == 1) {
- const uchar *flash_base = (const uchar *)CONFIG_SYS_FLASH_BASE;
+ const uchar *flash_base = (const uchar *)CFG_SYS_FLASH_BASE;
printf(" CRC: %08X", crc32(0,
flash_base,
@@ -356,8 +356,8 @@ static int initr_flash(void)
putc('\n');
/* update start of FLASH memory */
-#ifdef CONFIG_SYS_FLASH_BASE
- bd->bi_flashstart = CONFIG_SYS_FLASH_BASE;
+#ifdef CFG_SYS_FLASH_BASE
+ bd->bi_flashstart = CFG_SYS_FLASH_BASE;
#endif
/* size of FLASH memory (final value) */
bd->bi_flashsize = flash_size;
@@ -370,7 +370,7 @@ static int initr_flash(void)
#if defined(CONFIG_OXC) || defined(CONFIG_RMU)
/* flash mapped at end of memory map */
bd->bi_flashoffset = CONFIG_TEXT_BASE + flash_size;
-#elif CONFIG_SYS_MONITOR_BASE == CONFIG_SYS_FLASH_BASE
+#elif CONFIG_SYS_MONITOR_BASE == CFG_SYS_FLASH_BASE
bd->bi_flashoffset = monitor_flash_len; /* reserved area for monitor */
#endif
return 0;
diff --git a/common/spl/Kconfig.nxp b/common/spl/Kconfig.nxp
index 8da8553..fc696cf 100644
--- a/common/spl/Kconfig.nxp
+++ b/common/spl/Kconfig.nxp
@@ -26,7 +26,7 @@ config SPL_SYS_CCSR_DO_NOT_RELOCATE
bool "Ensures that CCSR is not relocated"
depends on PPC
help
- If this is defined, then CONFIG_SYS_CCSRBAR_PHYS will be forced to a
+ If this is defined, then CFG_SYS_CCSRBAR_PHYS will be forced to a
value that ensures that CCSR is not relocated.
config TPL_SYS_CCSR_DO_NOT_RELOCATE
@@ -59,7 +59,7 @@ config SPL_RELOC_TEXT_BASE
config SPL_RELOC_STACK
hex "Address of the start of the stack SPL will use after relocation."
help
- If unspecified, this is equal to CONFIG_SYS_SPL_MALLOC_START. Starting
+ If unspecified, this is equal to CFG_SYS_SPL_MALLOC_START. Starting
address of the malloc pool used in SPL. When this option is set the full
malloc is used in SPL and it is set up by spl_init() and before that, the
simple malloc() can be used if CONFIG_SYS_MALLOC_F is defined.
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 22d2a06..1d2e8fd 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -43,8 +43,8 @@
DECLARE_GLOBAL_DATA_PTR;
DECLARE_BINMAN_MAGIC_SYM;
-#ifndef CONFIG_SYS_UBOOT_START
-#define CONFIG_SYS_UBOOT_START CONFIG_TEXT_BASE
+#ifndef CFG_SYS_UBOOT_START
+#define CFG_SYS_UBOOT_START CONFIG_TEXT_BASE
#endif
u32 *boot_params_ptr = NULL;
@@ -250,7 +250,7 @@ void spl_set_header_raw_uboot(struct spl_image_info *spl_image)
spl_image->entry_point = u_boot_pos;
spl_image->load_addr = u_boot_pos;
} else {
- spl_image->entry_point = CONFIG_SYS_UBOOT_START;
+ spl_image->entry_point = CFG_SYS_UBOOT_START;
spl_image->load_addr = CONFIG_TEXT_BASE;
}
spl_image->os = IH_OS_U_BOOT;
diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c
index c1ed31e..08da7fe 100644
--- a/common/spl/spl_fit.c
+++ b/common/spl/spl_fit.c
@@ -828,7 +828,7 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
}
/*
- * If a platform does not provide CONFIG_SYS_UBOOT_START, U-Boot's
+ * If a platform does not provide CFG_SYS_UBOOT_START, U-Boot's
* Makefile will set it to 0 and it will end up as the entry point
* here. What it actually means is: use the load address.
*/
diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c
index eaa95fb..1ef5e41 100644
--- a/common/spl/spl_nor.c
+++ b/common/spl/spl_nor.c
@@ -20,7 +20,7 @@ static ulong spl_nor_load_read(struct spl_load_info *load, ulong sector,
unsigned long __weak spl_nor_get_uboot_base(void)
{
- return CONFIG_SYS_UBOOT_BASE;
+ return CFG_SYS_UBOOT_BASE;
}
static int spl_nor_load_image(struct spl_image_info *spl_image,
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index da67424..2aff025 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -31,7 +31,7 @@ static int spi_load_image_os(struct spl_image_info *spl_image,
int err;
/* Read for a header, parse or error out. */
- spi_flash_read(flash, CONFIG_SYS_SPI_KERNEL_OFFS, sizeof(*header),
+ spi_flash_read(flash, CFG_SYS_SPI_KERNEL_OFFS, sizeof(*header),
(void *)header);
if (image_get_magic(header) != IH_MAGIC)
@@ -41,12 +41,12 @@ static int spi_load_image_os(struct spl_image_info *spl_image,
if (err)
return err;
- spi_flash_read(flash, CONFIG_SYS_SPI_KERNEL_OFFS,
+ spi_flash_read(flash, CFG_SYS_SPI_KERNEL_OFFS,
spl_image->size, (void *)spl_image->load_addr);
/* Read device tree. */
- spi_flash_read(flash, CONFIG_SYS_SPI_ARGS_OFFS,
- CONFIG_SYS_SPI_ARGS_SIZE,
+ spi_flash_read(flash, CFG_SYS_SPI_ARGS_OFFS,
+ CFG_SYS_SPI_ARGS_SIZE,
(void *)CONFIG_SYS_SPL_ARGS_ADDR);
return 0;
diff --git a/common/spl/spl_ubi.c b/common/spl/spl_ubi.c
index fb804f0..bcac25c 100644
--- a/common/spl/spl_ubi.c
+++ b/common/spl/spl_ubi.c
@@ -31,7 +31,7 @@ int spl_ubi_load_image(struct spl_image_info *spl_image,
#ifdef CONFIG_SPL_ONENAND_SUPPORT
case BOOT_DEVICE_ONENAND:
info.read = onenand_spl_read_block;
- info.peb_size = CONFIG_SYS_ONENAND_BLOCK_SIZE;
+ info.peb_size = CFG_SYS_ONENAND_BLOCK_SIZE;
break;
#endif
default:
diff --git a/common/spl/spl_xip.c b/common/spl/spl_xip.c
index 1258d85..77c23ba 100644
--- a/common/spl/spl_xip.c
+++ b/common/spl/spl_xip.c
@@ -25,6 +25,6 @@ static int spl_xip(struct spl_image_info *spl_image,
}
#endif
return(spl_parse_image_header(spl_image, bootdev,
- (const struct legacy_img_hdr *)CONFIG_SYS_UBOOT_BASE));
+ (const struct legacy_img_hdr *)CFG_SYS_UBOOT_BASE));
}
SPL_LOAD_IMAGE_METHOD("XIP", 0, BOOT_DEVICE_XIP, spl_xip);
generated by cgit v1.1 at 2024-10-17 12:43:03 +0000