Convert CONFIG_MONITOR_IS_IN_RAM to Kconfig
This converts the following to Kconfig: CONFIG_MONITOR_IS_IN_RAM As part of this, reword some of the documentation slightly to reflect that this is in Kconfig and not a define now. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
parent
829e9d2236
commit
e52fca2236
@ -380,6 +380,10 @@ config SYS_IMMR
|
||||
Address for the Internal Memory-Mapped Registers (IMMR) window used
|
||||
to configure the features of many Freescale / NXP SoCs.
|
||||
|
||||
config MONITOR_IS_IN_RAM
|
||||
bool "U-Boot is loaded in to RAM by a pre-loader"
|
||||
depends on M68K || NIOS2
|
||||
|
||||
config SKIP_LOWLEVEL_INIT
|
||||
bool "Skip the calls to certain low level initialization functions"
|
||||
depends on ARM || MIPS || RISCV
|
||||
|
||||
@ -77,21 +77,16 @@ in dir ./u-boot-x-x-x/
|
||||
|
||||
please first check:
|
||||
|
||||
in ./include/configs/cobra5272.h
|
||||
in ./configs/cobra5272_defconfig
|
||||
|
||||
CONFIG_MONITOR_IS_IN_RAM has to be undefined, e. g. as follows:
|
||||
|
||||
#if 0
|
||||
#define CONFIG_MONITOR_IS_IN_RAM
|
||||
/* define if monitor is started from a pre-loader */
|
||||
#endif
|
||||
CONFIG_MONITOR_IS_IN_RAM has to be not present in the file
|
||||
|
||||
=> u-boot as single bootloader starting from flash
|
||||
|
||||
|
||||
in board/cobra5272/config.mk CONFIG_TEXT_BASE should be
|
||||
in configs/cobra5272_defconfig CONFIG_TEXT_BASE should be
|
||||
|
||||
CONFIG_TEXT_BASE = 0xffe00000
|
||||
CONFIG_TEXT_BASE=0xffe00000
|
||||
|
||||
=> linking address for u-boot as single bootloader stored in flash
|
||||
|
||||
@ -115,22 +110,18 @@ in dir ./u-boot-x-x-x/
|
||||
host> make distclean
|
||||
|
||||
please modify the settings:
|
||||
in ./configs/cobra5272_defconfig
|
||||
|
||||
in ./include/configs/cobra5272.h
|
||||
CONFIG_MONITOR_IS_IN_RAM now has to be enabled, e. g. as follows:
|
||||
|
||||
CONFIG_MONITOR_IS_IN_RAM now has to be defined, e. g. as follows:
|
||||
|
||||
#if 1
|
||||
#define CONFIG_MONITOR_IS_IN_RAM
|
||||
/*define if monitor is started from a pre-loader */
|
||||
#endif
|
||||
CONFIG_MONITOR_IS_IN_RAM=y
|
||||
|
||||
=> u-boot as RAM version, chainloaded by another bootloader or using bdm cable
|
||||
|
||||
|
||||
in board/cobra5272/config.mk CONFIG_TEXT_BASE should be
|
||||
in configs/cobra5272_defconfig CONFIG_TEXT_BASE should be
|
||||
|
||||
CONFIG_TEXT_BASE = 0x00020000
|
||||
CONFIG_TEXT_BASE=0x00020000
|
||||
|
||||
=> target linking address for RAM
|
||||
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
CONFIG_NIOS2=y
|
||||
CONFIG_SYS_CONFIG_NAME="10m50_devboard"
|
||||
CONFIG_MONITOR_IS_IN_RAM=y
|
||||
CONFIG_SYS_MALLOC_LEN=0x20000
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x400
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
CONFIG_NIOS2=y
|
||||
CONFIG_SYS_CONFIG_NAME="3c120_devboard"
|
||||
CONFIG_MONITOR_IS_IN_RAM=y
|
||||
CONFIG_SYS_MALLOC_LEN=0x20000
|
||||
CONFIG_SYS_MALLOC_F_LEN=0x400
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
|
||||
@ -93,10 +93,10 @@ 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
|
||||
CONFIG_MONITOR_IS_IN_RAM must be enabled. If it is enabled 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
|
||||
the boards defconfig file (CONFIG_SYS_MONITOR_BASE) and Makefile
|
||||
(CONFIG_TEXT_BASE) to the load address.
|
||||
|
||||
ColdFire CPU specific options/settings
|
||||
|
||||
@ -32,6 +32,5 @@
|
||||
*/
|
||||
#define CFG_SYS_SDRAM_BASE 0xc8000000
|
||||
#define CFG_SYS_SDRAM_SIZE 0x08000000
|
||||
#define CONFIG_MONITOR_IS_IN_RAM
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
@ -28,6 +28,5 @@
|
||||
*/
|
||||
#define CFG_SYS_SDRAM_BASE 0xD0000000
|
||||
#define CFG_SYS_SDRAM_SIZE 0x08000000
|
||||
#define CONFIG_MONITOR_IS_IN_RAM
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
@ -20,8 +20,6 @@
|
||||
|
||||
#define CFG_SYS_UART_PORT (0)
|
||||
|
||||
#undef CONFIG_MONITOR_IS_IN_RAM /* no pre-loader required!!! ;-) */
|
||||
|
||||
/*
|
||||
* Clock configuration: enable only one of the following options
|
||||
*/
|
||||
|
||||
@ -19,8 +19,6 @@
|
||||
|
||||
#define CFG_SYS_UART_PORT (0)
|
||||
|
||||
#undef CONFIG_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
|
||||
*/
|
||||
|
||||
@ -19,8 +19,6 @@
|
||||
|
||||
#define CFG_SYS_UART_PORT (0)
|
||||
|
||||
#undef CONFIG_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
|
||||
*/
|
||||
|
||||
@ -38,16 +38,6 @@
|
||||
#error No card type defined!
|
||||
#endif
|
||||
|
||||
/*
|
||||
* CONFIG_RAM defines if u-boot is loaded via BDM (or started from
|
||||
* a different bootloader that has already performed RAM setup) or
|
||||
* started directly from flash, which is the regular case for production
|
||||
* boards.
|
||||
*/
|
||||
#ifdef CONFIG_RAM
|
||||
#define CONFIG_MONITOR_IS_IN_RAM
|
||||
#endif
|
||||
|
||||
/* I2C */
|
||||
|
||||
/*
|
||||
@ -69,21 +59,6 @@
|
||||
#define CFG_SYS_UART_PORT (2)
|
||||
#define CFG_SYS_UART2_ALT3_GPIO
|
||||
|
||||
/*
|
||||
* Configuration for environment
|
||||
* 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 */
|
||||
|
||||
@ -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
|
||||
|
||||
@ -14,8 +14,6 @@
|
||||
|
||||
#define CFG_SYS_UART_PORT (0)
|
||||
|
||||
#undef CONFIG_MONITOR_IS_IN_RAM /* starts uboot direct */
|
||||
|
||||
/*----------------------------------------------------------------------*
|
||||
* Options *
|
||||
*----------------------------------------------------------------------*/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user