mirror of
https://xff.cz/git/u-boot/
synced 2025-09-02 01:02:19 +02:00
global: Migrate CONFIG_PRAM to CFG
Perform a simple rename of CONFIG_PRAM to CFG_PRAM Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
4
README
4
README
@@ -1069,11 +1069,11 @@ The following options need to be configured:
|
|||||||
or define CFG_ENV_FLAGS_LIST_STATIC.
|
or define CFG_ENV_FLAGS_LIST_STATIC.
|
||||||
|
|
||||||
- Protected RAM:
|
- Protected RAM:
|
||||||
CONFIG_PRAM
|
CFG_PRAM
|
||||||
|
|
||||||
Define this variable to enable the reservation of
|
Define this variable to enable the reservation of
|
||||||
"protected RAM", i. e. RAM which is not overwritten
|
"protected RAM", i. e. RAM which is not overwritten
|
||||||
by U-Boot. Define CONFIG_PRAM to hold the number of
|
by U-Boot. Define CFG_PRAM to hold the number of
|
||||||
kB you want to reserve for pRAM. You can overwrite
|
kB you want to reserve for pRAM. You can overwrite
|
||||||
this default value by defining an environment
|
this default value by defining an environment
|
||||||
variable "pram" to the number of kB you want to
|
variable "pram" to the number of kB you want to
|
||||||
|
@@ -380,19 +380,19 @@ static int setup_dest_addr(void)
|
|||||||
return arch_setup_dest_addr();
|
return arch_setup_dest_addr();
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PRAM
|
#ifdef CFG_PRAM
|
||||||
/* reserve protected RAM */
|
/* reserve protected RAM */
|
||||||
static int reserve_pram(void)
|
static int reserve_pram(void)
|
||||||
{
|
{
|
||||||
ulong reg;
|
ulong reg;
|
||||||
|
|
||||||
reg = env_get_ulong("pram", 10, CONFIG_PRAM);
|
reg = env_get_ulong("pram", 10, CFG_PRAM);
|
||||||
gd->relocaddr -= (reg << 10); /* size is in kB */
|
gd->relocaddr -= (reg << 10); /* size is in kB */
|
||||||
debug("Reserving %ldk for protected RAM at %08lx\n", reg,
|
debug("Reserving %ldk for protected RAM at %08lx\n", reg,
|
||||||
gd->relocaddr);
|
gd->relocaddr);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_PRAM */
|
#endif /* CFG_PRAM */
|
||||||
|
|
||||||
/* Round memory pointer down to next 4 kB limit */
|
/* Round memory pointer down to next 4 kB limit */
|
||||||
static int reserve_round_4k(void)
|
static int reserve_round_4k(void)
|
||||||
@@ -925,7 +925,7 @@ static const init_fnc_t init_sequence_f[] = {
|
|||||||
#ifdef CONFIG_OF_BOARD_FIXUP
|
#ifdef CONFIG_OF_BOARD_FIXUP
|
||||||
fix_fdt,
|
fix_fdt,
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_PRAM
|
#ifdef CFG_PRAM
|
||||||
reserve_pram,
|
reserve_pram,
|
||||||
#endif
|
#endif
|
||||||
reserve_round_4k,
|
reserve_round_4k,
|
||||||
|
@@ -533,7 +533,7 @@ static int initr_ide(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_PRAM)
|
#if defined(CFG_PRAM)
|
||||||
/*
|
/*
|
||||||
* Export available size of memory for Linux, taking into account the
|
* Export available size of memory for Linux, taking into account the
|
||||||
* protected RAM at top of memory
|
* protected RAM at top of memory
|
||||||
@@ -543,7 +543,7 @@ int initr_mem(void)
|
|||||||
ulong pram = 0;
|
ulong pram = 0;
|
||||||
char memsz[32];
|
char memsz[32];
|
||||||
|
|
||||||
pram = env_get_ulong("pram", 10, CONFIG_PRAM);
|
pram = env_get_ulong("pram", 10, CFG_PRAM);
|
||||||
sprintf(memsz, "%ldk", (long int)((gd->ram_size / 1024) - pram));
|
sprintf(memsz, "%ldk", (long int)((gd->ram_size / 1024) - pram));
|
||||||
env_set("mem", memsz);
|
env_set("mem", memsz);
|
||||||
|
|
||||||
@@ -791,7 +791,7 @@ static init_fnc_t init_sequence_r[] = {
|
|||||||
*/
|
*/
|
||||||
last_stage_init,
|
last_stage_init,
|
||||||
#endif
|
#endif
|
||||||
#if defined(CONFIG_PRAM)
|
#if defined(CFG_PRAM)
|
||||||
initr_mem,
|
initr_mem,
|
||||||
#endif
|
#endif
|
||||||
run_main_loop,
|
run_main_loop,
|
||||||
|
@@ -29,7 +29,7 @@
|
|||||||
"save\0" \
|
"save\0" \
|
||||||
""
|
""
|
||||||
|
|
||||||
#define CONFIG_PRAM 512 /* 512 KB */
|
#define CFG_PRAM 512 /* 512 KB */
|
||||||
|
|
||||||
#define CFG_SYS_CLK 166666666 /* CPU Core Clock */
|
#define CFG_SYS_CLK 166666666 /* CPU Core Clock */
|
||||||
#define CFG_SYS_PLL_ODR 0x36
|
#define CFG_SYS_PLL_ODR 0x36
|
||||||
|
@@ -39,7 +39,7 @@
|
|||||||
"save\0" \
|
"save\0" \
|
||||||
""
|
""
|
||||||
|
|
||||||
#define CONFIG_PRAM 512 /* 512 KB */
|
#define CFG_PRAM 512 /* 512 KB */
|
||||||
|
|
||||||
#define CFG_SYS_CLK 75000000
|
#define CFG_SYS_CLK 75000000
|
||||||
#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 2
|
#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 2
|
||||||
|
@@ -57,7 +57,7 @@
|
|||||||
#define CFG_SYS_FLASH_BASE (CFG_SYS_CS0_BASE)
|
#define CFG_SYS_FLASH_BASE (CFG_SYS_CS0_BASE)
|
||||||
|
|
||||||
#if 0 /* test-only */
|
#if 0 /* test-only */
|
||||||
#define CONFIG_PRAM 512 /* test-only for SDRAM problem!!!!!!!!!!!!!!!!!!!! */
|
#define CFG_PRAM 512 /* test-only for SDRAM problem!!!!!!!!!!!!!!!!!!!! */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@@ -42,7 +42,7 @@
|
|||||||
"save\0" \
|
"save\0" \
|
||||||
""
|
""
|
||||||
|
|
||||||
#define CONFIG_PRAM 512 /* 512 KB */
|
#define CFG_PRAM 512 /* 512 KB */
|
||||||
|
|
||||||
#define CFG_SYS_CLK 80000000
|
#define CFG_SYS_CLK 80000000
|
||||||
#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 3
|
#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 3
|
||||||
|
@@ -34,7 +34,7 @@
|
|||||||
"save\0" \
|
"save\0" \
|
||||||
""
|
""
|
||||||
|
|
||||||
#define CONFIG_PRAM 512 /* 512 KB */
|
#define CFG_PRAM 512 /* 512 KB */
|
||||||
|
|
||||||
#define CFG_SYS_CLK 80000000
|
#define CFG_SYS_CLK 80000000
|
||||||
#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 3
|
#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 3
|
||||||
|
@@ -36,7 +36,7 @@
|
|||||||
"save\0" \
|
"save\0" \
|
||||||
""
|
""
|
||||||
|
|
||||||
#define CONFIG_PRAM 512 /* 512 KB */
|
#define CFG_PRAM 512 /* 512 KB */
|
||||||
|
|
||||||
#define CFG_SYS_CLK 80000000
|
#define CFG_SYS_CLK 80000000
|
||||||
#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 3
|
#define CFG_SYS_CPU_CLK CFG_SYS_CLK * 3
|
||||||
|
@@ -152,7 +152,7 @@
|
|||||||
|
|
||||||
#if defined(CONFIG_TI_SECURE_DEVICE)
|
#if defined(CONFIG_TI_SECURE_DEVICE)
|
||||||
/* Avoid relocating onto firewalled area at end of DRAM */
|
/* Avoid relocating onto firewalled area at end of DRAM */
|
||||||
#define CONFIG_PRAM (64 * 1024)
|
#define CFG_PRAM (64 * 1024)
|
||||||
#endif /* CONFIG_TI_SECURE_DEVICE */
|
#endif /* CONFIG_TI_SECURE_DEVICE */
|
||||||
|
|
||||||
#endif /* __CONFIG_AM43XX_EVM_H */
|
#endif /* __CONFIG_AM43XX_EVM_H */
|
||||||
|
@@ -9,7 +9,7 @@
|
|||||||
#define CFG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR
|
#define CFG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR
|
||||||
#define CFG_SYS_INIT_RAM_SIZE OCRAM_SIZE
|
#define CFG_SYS_INIT_RAM_SIZE OCRAM_SIZE
|
||||||
|
|
||||||
#define CONFIG_PRAM ((CONFIG_KM_PNVRAM + \
|
#define CFG_PRAM ((CONFIG_KM_PNVRAM + \
|
||||||
CONFIG_KM_PHRAM + \
|
CONFIG_KM_PHRAM + \
|
||||||
CONFIG_KM_RESERVED_PRAM) >> 10)
|
CONFIG_KM_RESERVED_PRAM) >> 10)
|
||||||
|
|
||||||
|
@@ -170,7 +170,7 @@
|
|||||||
/* set the default PRAM value to at least PNVRAM + PHRAM when pram env variable
|
/* set the default PRAM value to at least PNVRAM + PHRAM when pram env variable
|
||||||
* is not valid yet, which is the case for when u-boot copies itself to RAM
|
* is not valid yet, which is the case for when u-boot copies itself to RAM
|
||||||
*/
|
*/
|
||||||
#define CONFIG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM) >> 10)
|
#define CFG_PRAM ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM) >> 10)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* IFC Definitions
|
* IFC Definitions
|
||||||
|
@@ -169,6 +169,6 @@
|
|||||||
#define KERNEL_ADDRESS (SDRAM_END-KERNEL_MAXSIZE)
|
#define KERNEL_ADDRESS (SDRAM_END-KERNEL_MAXSIZE)
|
||||||
|
|
||||||
/* Reserve protected RAM for attached kernel */
|
/* Reserve protected RAM for attached kernel */
|
||||||
#define CONFIG_PRAM ((KERNEL_MAXSIZE >> 10)+1)
|
#define CFG_PRAM ((KERNEL_MAXSIZE >> 10)+1)
|
||||||
|
|
||||||
#endif /* __CONFIG_H */
|
#endif /* __CONFIG_H */
|
||||||
|
@@ -36,7 +36,7 @@
|
|||||||
|
|
||||||
/* Input, PCI, Flexbus, and VCO */
|
/* Input, PCI, Flexbus, and VCO */
|
||||||
|
|
||||||
#define CONFIG_PRAM 2048 /* 2048 KB */
|
#define CFG_PRAM 2048 /* 2048 KB */
|
||||||
|
|
||||||
#define CFG_SYS_MBAR 0xFC000000
|
#define CFG_SYS_MBAR 0xFC000000
|
||||||
|
|
||||||
|
@@ -279,7 +279,7 @@
|
|||||||
* firewall violation, we tell u-boot that memory is protected RAM (PRAM)
|
* firewall violation, we tell u-boot that memory is protected RAM (PRAM)
|
||||||
*/
|
*/
|
||||||
#if (CONFIG_TI_SECURE_EMIF_REGION_START == 0)
|
#if (CONFIG_TI_SECURE_EMIF_REGION_START == 0)
|
||||||
#define CONFIG_PRAM (CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE) >> 10
|
#define CFG_PRAM (CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE) >> 10
|
||||||
#endif
|
#endif
|
||||||
#else
|
#else
|
||||||
/*
|
/*
|
||||||
|
Reference in New Issue
Block a user