Signed-off-by: Tom Rini trini@konsulko.com --- arch/m68k/cpu/mcf52x2/cpu_init.c | 12 ++++++------ arch/m68k/cpu/mcf52x2/start.S | 4 ++-- arch/m68k/cpu/mcf530x/start.S | 4 ++-- arch/m68k/cpu/mcf532x/speed.c | 4 ++-- arch/m68k/cpu/mcf532x/start.S | 6 +++--- board/astro/mcf5373l/mcf5373l.c | 2 +- board/cobra5272/README | 8 ++++---- board/freescale/m53017evb/README | 2 +- board/freescale/m5373evb/README | 2 +- doc/arch/m68k.rst | 2 +- drivers/mtd/cfi_flash.c | 2 +- include/configs/10m50_devboard.h | 2 +- include/configs/3c120_devboard.h | 2 +- include/configs/M5249EVB.h | 2 +- include/configs/M5272C3.h | 2 +- include/configs/M5282EVB.h | 2 +- include/configs/astro_mcf5373l.h | 12 +----------- include/configs/cobra5272.h | 21 --------------------- include/configs/eb_cpu5282.h | 2 +- scripts/config_whitelist.txt | 2 +- 20 files changed, 32 insertions(+), 63 deletions(-)
diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c index 99eb61f16758..1d6e39a2ce5e 100644 --- a/arch/m68k/cpu/mcf52x2/cpu_init.c +++ b/arch/m68k/cpu/mcf52x2/cpu_init.c @@ -334,7 +334,7 @@ void cpu_init_f(void) /* if we come from RAM we assume the CPU is * already initialized. */ -#ifndef CONFIG_MONITOR_IS_IN_RAM +#ifndef CFG_MONITOR_IS_IN_RAM sysctrl_t *sysctrl = (sysctrl_t *) (CFG_SYS_MBAR); gpio_t *gpio = (gpio_t *) (MMAP_GPIO); csctrl_t *csctrl = (csctrl_t *) (MMAP_FBCS); @@ -390,7 +390,7 @@ void cpu_init_f(void) out_be32(&csctrl->cs_or7, CONFIG_SYS_OR7_PRELIM); #endif
-#endif /* #ifndef CONFIG_MONITOR_IS_IN_RAM */ +#endif /* #ifndef CFG_MONITOR_IS_IN_RAM */
/* enable instruction cache now */ icache_enable(); @@ -460,7 +460,7 @@ void cpu_init_f(void) * already initialized. */
-#ifndef CONFIG_MONITOR_IS_IN_RAM +#ifndef CFG_MONITOR_IS_IN_RAM wdog_t *wdog_reg = (wdog_t *) (MMAP_WDOG); gpio_t *gpio_reg = (gpio_t *) (MMAP_GPIO);
@@ -469,7 +469,7 @@ void cpu_init_f(void)
/* FlexBus Chipselect */ init_fbcs(); -#endif /* #ifndef CONFIG_MONITOR_IS_IN_RAM */ +#endif /* #ifndef CFG_MONITOR_IS_IN_RAM */
#ifdef CONFIG_SYS_I2C_FSL CFG_SYS_I2C_PINMUX_REG &= CFG_SYS_I2C_PINMUX_CLR; @@ -557,7 +557,7 @@ void cpu_init_f(void) MCFWTM_WCR = 0; #endif
-#ifndef CONFIG_MONITOR_IS_IN_RAM +#ifndef CFG_MONITOR_IS_IN_RAM /* Set speed /PLL */ MCFCLOCK_SYNCR = MCFCLOCK_SYNCR_MFD(CFG_SYS_MFD) | @@ -614,7 +614,7 @@ void cpu_init_f(void) /* FlexBus Chipselect */ init_fbcs();
-#endif /* CONFIG_MONITOR_IS_IN_RAM */ +#endif /* CFG_MONITOR_IS_IN_RAM */
/* defer enabling cache until boot (see do_go) */ /* icache_enable(); */ diff --git a/arch/m68k/cpu/mcf52x2/start.S b/arch/m68k/cpu/mcf52x2/start.S index d48d0192eea2..47d935d3d9f0 100644 --- a/arch/m68k/cpu/mcf52x2/start.S +++ b/arch/m68k/cpu/mcf52x2/start.S @@ -25,7 +25,7 @@ /* If we come from a pre-loader we don't need an initial exception * table. */ -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM)
.text
@@ -164,7 +164,7 @@ _after_flashbar_copy: * if we come from a pre-loader we have no exception table and * therefore no VBR to set */ -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) #if defined(CONFIG_M5282) && (CONFIG_TEXT_BASE == CFG_SYS_INT_FLASH_BASE) move.l #CFG_SYS_INT_FLASH_BASE, %d0 #else diff --git a/arch/m68k/cpu/mcf530x/start.S b/arch/m68k/cpu/mcf530x/start.S index dbe2b54e4101..4d474576457e 100644 --- a/arch/m68k/cpu/mcf530x/start.S +++ b/arch/m68k/cpu/mcf530x/start.S @@ -27,7 +27,7 @@ /* If we come from a pre-loader we don't need an initial exception * table. */ -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM)
.text
@@ -109,7 +109,7 @@ _start: * if we come from a pre-loader we have no exception table and * therefore no VBR to set */ -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) move.l #CFG_SYS_FLASH_BASE, %d0 movec %d0, %VBR #endif diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c index 32ffac08135d..f58f84f976ce 100644 --- a/arch/m68k/cpu/mcf532x/speed.c +++ b/arch/m68k/cpu/mcf532x/speed.c @@ -192,7 +192,7 @@ int clock_pll(int fsys, int flags) #endif
/* must not tamper with SDRAMC if running from SDRAM */ -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) /* * Check to see if the SDRAM has already been initialized. * If it has then the SDRAM needs to be put into self refresh @@ -244,7 +244,7 @@ int clock_pll(int fsys, int flags)
/* wait for DQS logic to relock */ for (i = 0; i < 0x200; i++) ; -#endif /* !defined(CONFIG_MONITOR_IS_IN_RAM) */ +#endif /* !defined(CFG_MONITOR_IS_IN_RAM) */
return fout; } diff --git a/arch/m68k/cpu/mcf532x/start.S b/arch/m68k/cpu/mcf532x/start.S index 72a2f99b7dd2..4e6f2b8621d7 100644 --- a/arch/m68k/cpu/mcf532x/start.S +++ b/arch/m68k/cpu/mcf532x/start.S @@ -24,7 +24,7 @@ addl #60,%sp; /* space for 15 regs */ \ rte;
-#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM)
.text
@@ -86,7 +86,7 @@ vector192_255: .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT .long _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT, _FAULT -#endif /* !defined(CONFIG_MONITOR_IS_IN_RAM) */ +#endif /* !defined(CFG_MONITOR_IS_IN_RAM) */
.text
@@ -96,7 +96,7 @@ _start: nop move.w #0x2700,%sr /* Mask off Interrupt */
-#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) /* Set vector base register at the beginning of the Flash */ move.l #CFG_SYS_FLASH_BASE, %d0 movec %d0, %VBR diff --git a/board/astro/mcf5373l/mcf5373l.c b/board/astro/mcf5373l/mcf5373l.c index 43563c412793..c6172365744a 100644 --- a/board/astro/mcf5373l/mcf5373l.c +++ b/board/astro/mcf5373l/mcf5373l.c @@ -32,7 +32,7 @@ int checkboard(void)
int dram_init(void) { -#if !defined(CONFIG_MONITOR_IS_IN_RAM) +#if !defined(CFG_MONITOR_IS_IN_RAM) sdram_t *sdp = (sdram_t *)(MMAP_SDRAM);
/* diff --git a/board/cobra5272/README b/board/cobra5272/README index ac62e557a075..770b66327ef5 100644 --- a/board/cobra5272/README +++ b/board/cobra5272/README @@ -79,10 +79,10 @@ please first check:
in ./include/configs/cobra5272.h
- CONFIG_MONITOR_IS_IN_RAM has to be undefined, e. g. as follows: + CFG_MONITOR_IS_IN_RAM has to be undefined, e. g. as follows:
#if 0 - #define CONFIG_MONITOR_IS_IN_RAM + #define CFG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */ #endif
@@ -118,10 +118,10 @@ please modify the settings:
in ./include/configs/cobra5272.h
- CONFIG_MONITOR_IS_IN_RAM now has to be defined, e. g. as follows: + CFG_MONITOR_IS_IN_RAM now has to be defined, e. g. as follows:
#if 1 - #define CONFIG_MONITOR_IS_IN_RAM + #define CFG_MONITOR_IS_IN_RAM /*define if monitor is started from a pre-loader */ #endif
diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README index 34f05f3fdc72..193ba9394ac3 100644 --- a/board/freescale/m53017evb/README +++ b/board/freescale/m53017evb/README @@ -98,7 +98,7 @@ CONFIG_SYS_IMMR -- define for MBAR offset
CFG_SYS_MBAR -- define MBAR offset
-CONFIG_MONITOR_IS_IN_RAM -- Not support +CFG_MONITOR_IS_IN_RAM -- Not support
CFG_SYS_INIT_RAM_ADDR -- defines the base address of the MCF5301x internal SRAM
diff --git a/board/freescale/m5373evb/README b/board/freescale/m5373evb/README index 7240648796b5..807785cb4ff5 100644 --- a/board/freescale/m5373evb/README +++ b/board/freescale/m5373evb/README @@ -97,7 +97,7 @@ CONFIG_SYS_IMMR -- define for MBAR offset
CFG_SYS_MBAR -- define MBAR offset
-CONFIG_MONITOR_IS_IN_RAM -- Not support +CFG_MONITOR_IS_IN_RAM -- Not support
CFG_SYS_INIT_RAM_ADDR -- defines the base address of the MCF5373 internal SRAM
diff --git a/doc/arch/m68k.rst b/doc/arch/m68k.rst index 770327fea21a..dc2a41d4e990 100644 --- a/doc/arch/m68k.rst +++ b/doc/arch/m68k.rst @@ -93,7 +93,7 @@ Configuration to use a pre-loader ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
If U-Boot should be loaded to RAM and started by a pre-loader -CONFIG_MONITOR_IS_IN_RAM must be defined. If it is defined the +CFG_MONITOR_IS_IN_RAM must be defined. If it is defined the initial vector table and basic processor initialization will not be compiled in. The start address of U-Boot must be adjusted in the boards config header file (CONFIG_SYS_MONITOR_BASE) and Makefile diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index f3abe7842b69..0461aa1adbed 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -2360,7 +2360,7 @@ static void flash_protect_default(void) /* Monitor protection ON by default */ #if defined(CONFIG_SYS_MONITOR_BASE) && \ (CONFIG_SYS_MONITOR_BASE >= CFG_SYS_FLASH_BASE) && \ - (!defined(CONFIG_MONITOR_IS_IN_RAM)) + (!defined(CFG_MONITOR_IS_IN_RAM)) flash_protect(FLAG_PROTECT_SET, CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1, diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h index 3a4fbc6eab83..cc22a4724aaa 100644 --- a/include/configs/10m50_devboard.h +++ b/include/configs/10m50_devboard.h @@ -32,6 +32,6 @@ */ #define CFG_SYS_SDRAM_BASE 0xc8000000 #define CFG_SYS_SDRAM_SIZE 0x08000000 -#define CONFIG_MONITOR_IS_IN_RAM +#define CFG_MONITOR_IS_IN_RAM
#endif /* __CONFIG_H */ diff --git a/include/configs/3c120_devboard.h b/include/configs/3c120_devboard.h index ab889180eede..556f31efe59f 100644 --- a/include/configs/3c120_devboard.h +++ b/include/configs/3c120_devboard.h @@ -28,6 +28,6 @@ */ #define CFG_SYS_SDRAM_BASE 0xD0000000 #define CFG_SYS_SDRAM_SIZE 0x08000000 -#define CONFIG_MONITOR_IS_IN_RAM +#define CFG_MONITOR_IS_IN_RAM
#endif /* __CONFIG_H */ diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 0e38eeb4a365..4a9e9ed882ac 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -20,7 +20,7 @@
#define CFG_SYS_UART_PORT (0)
-#undef CONFIG_MONITOR_IS_IN_RAM /* no pre-loader required!!! ;-) */ +#undef CFG_MONITOR_IS_IN_RAM /* no pre-loader required!!! ;-) */
/* * Clock configuration: enable only one of the following options diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 4b88cfc2cdd9..99f1df087e36 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -19,7 +19,7 @@
#define CFG_SYS_UART_PORT (0)
-#undef CONFIG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */ +#undef CFG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */
/* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index f34985c47d4b..4b20da4a23eb 100644 --- a/include/configs/M5282EVB.h +++ b/include/configs/M5282EVB.h @@ -19,7 +19,7 @@
#define CFG_SYS_UART_PORT (0)
-#undef CONFIG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */ +#undef CFG_MONITOR_IS_IN_RAM /* define if monitor is started from a pre-loader */
/* Configuration for environment * Environment is embedded in u-boot in the second sector of the flash diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 8f4419f402f7..fe49b04609cf 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -45,7 +45,7 @@ * boards. */ #ifdef CONFIG_RAM -#define CONFIG_MONITOR_IS_IN_RAM +#define CFG_MONITOR_IS_IN_RAM #endif
/* I2C */ @@ -74,16 +74,6 @@ * Environment is located in the last sector of the flash */
-#ifndef CONFIG_MONITOR_IS_IN_RAM -#else -/* - * environment in RAM - This is used to use a single PC-based application - * to load an image, load U-Boot, load an environment and then start U-Boot - * to execute the commands from the environment. Feedback is done via setting - * and reading memory locations. - */ -#endif - /* here we put our FPGA configuration... */
/* Define user parameters that have to be customized most likely */ diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 1b5115f7caf1..b0acdb2e7d62 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -42,27 +42,6 @@
#define CFG_SYS_UART_PORT (0)
-/* --- - * CONFIG_MONITOR_IS_IN_RAM defines if u-boot is started from a different - * bootloader residing in flash ('chainloading'); if you want to use - * chainloading or want to compile a u-boot binary that can be loaded into - * RAM via BDM set - * "#if 0" to "#if 1" - * You will need a first stage bootloader then, e. g. colilo or a working BDM - * cable (Background Debug Mode) - * - * Setting #if 0: u-boot will start from flash and relocate itself to RAM - * - * Please do not forget to modify the setting of CONFIG_TEXT_BASE - * in board/cobra5272/config.mk accordingly (#if 0: 0xffe00000; #if 1: 0x20000) - * - * --- - */ - -#if 0 -#define CONFIG_MONITOR_IS_IN_RAM /* monitor is started from a preloader */ -#endif - /* --- * Configuration for environment * Environment is embedded in u-boot in the second sector of the flash diff --git a/include/configs/eb_cpu5282.h b/include/configs/eb_cpu5282.h index a4370ca5c7cc..e8d85bdd78f2 100644 --- a/include/configs/eb_cpu5282.h +++ b/include/configs/eb_cpu5282.h @@ -14,7 +14,7 @@
#define CFG_SYS_UART_PORT (0)
-#undef CONFIG_MONITOR_IS_IN_RAM /* starts uboot direct */ +#undef CFG_MONITOR_IS_IN_RAM /* starts uboot direct */
/*----------------------------------------------------------------------* * Options * diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4185a1b9c003..01f78d11afd8 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -130,7 +130,7 @@ CFG_MIU_2BIT_21_7_INTERLEAVED CFG_MIU_2BIT_INTERLEAVED CFG_MMC_DEFAULT_DEV CFG_MMC_SUNXI_SLOT -CONFIG_MONITOR_IS_IN_RAM +CFG_MONITOR_IS_IN_RAM CONFIG_MTD_NAND_VERIFY_WRITE CONFIG_MVGBE_PORTS CONFIG_MXC_GPT_HCLK