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 12672d2bfb00285eb7acb823954ff6d70631a095..2d3a48e88a59ea140133ace6caa5691001aa707d 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 e027248db56d6e36bcdbdca85d43ab1a7393dd59..2b4edf30c930f2dfa368169b6893e1e1e825ecb2 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 347bb7f7c02df5e87799371083ea6b26cac5850f..42060ee709d54be910d89327d0c66206dccc38e0 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 f7aba6e417f8a88ae0c9965e36a6bf2d6c8922f9..a4fda551f1f736e913c1e3d0b93737e559962cf1 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 049516edf4ae4b058327be273145ed7ecd71936b..8939c8e7ab9c3cd71ecb4a281d45d669e0580672 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 c71130909fca2bbf4adc34e79d4f826757465240..4fd539c0174969086b351c32e8d4a849d80e8636 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 b6d82c730c64031d0513ca80723a9d742de410ce..6359915e09a657555807e853d1e3b7264debd60e 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 d74a636fd7f87815d3dc14615e1f3424da1b432b..456135bdc64a84891aa7ac33c422f4fb31626e23 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 fa6f2d23e74eba59d8cec52c6a5fc6b1c8916cf6..4e8dcb5ef7f7161a5556c11d26b97f457cec0205 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 f43e00e8a2b689a3f500c382ed95ddcf52aaeca4..a2f73c475434467700eafd3acef04694afc41d0f 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 ffd394691a0957ed769e404d9fde2ae03e00d931..423bb773e9311a501efc37a22d959bb507d736e1 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 a4b6a6e555dd35cf9d76d9c8dcaa11a7f3c62669..33ee23ece1d14d2a900a5da68b8aebd55b74c229 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 a64b7b34dc15001214ae1ed4d179c6d0be462239..54eea322dd3f916a785cf98f4228a897785205ff 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 fe2ba9a03b4151ecf34477db93845ec481fd302b..19589be270ff7240b6409091b2ced6fa19f6c048 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 e9723ed5b3dd4be1565fd8810c2b2d4306c0867e..74a39c40785cf75a43d903dad03c2a032fd0cecb 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
 /*