global: Migrate CONFIG_PRAM to CFG

Perform a simple rename of CONFIG_PRAM to CFG_PRAM

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 12672d2..2d3a48e 100644 (file)
--- a/README
+++ b/README
@@ -1069,11 +1069,11 @@ The following options need to be configured:
                or define CFG_ENV_FLAGS_LIST_STATIC.
 
 - Protected RAM:
-               CONFIG_PRAM
+               CFG_PRAM
 
                Define this variable to enable the reservation of
                "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
                this default value by defining an environment
                variable "pram" to the number of kB you want to

diff --git a/common/board_f.c b/common/board_f.c
index e027248..2b4edf3 100644 (file)
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -380,19 +380,19 @@ static int setup_dest_addr(void)
        return arch_setup_dest_addr();
 }
 
-#ifdef CONFIG_PRAM
+#ifdef CFG_PRAM
 /* reserve protected RAM */
 static int reserve_pram(void)
 {
        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 */
        debug("Reserving %ldk for protected RAM at %08lx\n", reg,
              gd->relocaddr);
        return 0;
 }
-#endif /* CONFIG_PRAM */
+#endif /* CFG_PRAM */
 
 /* Round memory pointer down to next 4 kB limit */
 static int reserve_round_4k(void)
@@ -925,7 +925,7 @@ static const init_fnc_t init_sequence_f[] = {
 #ifdef CONFIG_OF_BOARD_FIXUP
        fix_fdt,
 #endif
-#ifdef CONFIG_PRAM
+#ifdef CFG_PRAM
        reserve_pram,
 #endif
        reserve_round_4k,

diff --git a/common/board_r.c b/common/board_r.c
index 347bb7f..42060ee 100644 (file)
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -533,7 +533,7 @@ static int initr_ide(void)
 }
 #endif
 
-#if defined(CONFIG_PRAM)
+#if defined(CFG_PRAM)
 /*
  * Export available size of memory for Linux, taking into account the
  * protected RAM at top of memory
@@ -543,7 +543,7 @@ int initr_mem(void)
        ulong pram = 0;
        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));
        env_set("mem", memsz);
 
@@ -791,7 +791,7 @@ static init_fnc_t init_sequence_r[] = {
         */
        last_stage_init,
 #endif
-#if defined(CONFIG_PRAM)
+#if defined(CFG_PRAM)
        initr_mem,
 #endif
        run_main_loop,

diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h
index f7aba6e..a4fda55 100644 (file)
--- a/include/configs/M5208EVBE.h
+++ b/include/configs/M5208EVBE.h
@@ -29,7 +29,7 @@
        "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_PLL_ODR        0x36

diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index 049516e..8939c8e 100644 (file)
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -39,7 +39,7 @@
        "save\0"                                \
        ""
 
-#define CONFIG_PRAM            512     /* 512 KB */
+#define CFG_PRAM               512     /* 512 KB */
 
 #define CFG_SYS_CLK                    75000000
 #define CFG_SYS_CPU_CLK                CFG_SYS_CLK * 2

diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h
index c711309..4fd539c 100644 (file)
--- a/include/configs/M5249EVB.h
+++ b/include/configs/M5249EVB.h
@@ -57,7 +57,7 @@
 #define CFG_SYS_FLASH_BASE             (CFG_SYS_CS0_BASE)
 
 #if 0 /* test-only */
-#define CONFIG_PRAM            512 /* test-only for SDRAM problem!!!!!!!!!!!!!!!!!!!! */
+#define CFG_PRAM               512 /* test-only for SDRAM problem!!!!!!!!!!!!!!!!!!!! */
 #endif
 
 /*

diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h
index b6d82c7..6359915 100644 (file)
--- a/include/configs/M53017EVB.h
+++ b/include/configs/M53017EVB.h
@@ -42,7 +42,7 @@
        "save\0"                                \
        ""
 
-#define CONFIG_PRAM            512     /* 512 KB */
+#define CFG_PRAM               512     /* 512 KB */
 
 #define CFG_SYS_CLK            80000000
 #define CFG_SYS_CPU_CLK        CFG_SYS_CLK * 3

diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index d74a636..456135b 100644 (file)
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -34,7 +34,7 @@
        "save\0"        \
        ""
 
-#define CONFIG_PRAM            512     /* 512 KB */
+#define CFG_PRAM               512     /* 512 KB */
 
 #define CFG_SYS_CLK                    80000000
 #define CFG_SYS_CPU_CLK                CFG_SYS_CLK * 3

diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index fa6f2d2..4e8dcb5 100644 (file)
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -36,7 +36,7 @@
        "save\0"        \
        ""
 
-#define CONFIG_PRAM            512     /* 512 KB */
+#define CFG_PRAM               512     /* 512 KB */
 
 #define CFG_SYS_CLK                    80000000
 #define CFG_SYS_CPU_CLK                CFG_SYS_CLK * 3

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index f43e00e..a2f73c4 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -152,7 +152,7 @@
 
 #if defined(CONFIG_TI_SECURE_DEVICE)
 /* 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_AM43XX_EVM_H */

diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h
index ffd3946..423bb77 100644 (file)
--- a/include/configs/km/pg-wcom-ls102xa.h
+++ b/include/configs/km/pg-wcom-ls102xa.h
@@ -9,7 +9,7 @@
 #define CFG_SYS_INIT_RAM_ADDR  OCRAM_BASE_ADDR
 #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_RESERVED_PRAM) >> 10)
 

diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h
index a4b6a6e..33ee23e 100644 (file)
--- a/include/configs/kmcent2.h
+++ b/include/configs/kmcent2.h
@@ -170,7 +170,7 @@
 /* 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
  */
-#define CONFIG_PRAM            ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM) >> 10)
+#define CFG_PRAM               ((CONFIG_KM_PNVRAM + CONFIG_KM_PHRAM) >> 10)
 
 /*
  * IFC Definitions

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index a64b7b3..54eea32 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -169,6 +169,6 @@
 #define KERNEL_ADDRESS                 (SDRAM_END-KERNEL_MAXSIZE)
 
 /* Reserve protected RAM for attached kernel */
-#define CONFIG_PRAM                    ((KERNEL_MAXSIZE >> 10)+1)
+#define CFG_PRAM                       ((KERNEL_MAXSIZE >> 10)+1)
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/stmark2.h b/include/configs/stmark2.h
index fe2ba9a..19589be 100644 (file)
--- a/include/configs/stmark2.h
+++ b/include/configs/stmark2.h
@@ -36,7 +36,7 @@
 
 /* Input, PCI, Flexbus, and VCO */
 
-#define CONFIG_PRAM                    2048    /* 2048 KB */
+#define CFG_PRAM                       2048    /* 2048 KB */
 
 #define CFG_SYS_MBAR                   0xFC000000
 

diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index e9723ed..74a39c4 100644 (file)
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -279,7 +279,7 @@
  * firewall violation, we tell u-boot that memory is protected RAM (PRAM)
  */
 #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
 #else
 /*