From: Angelo Dureghello angelo@kernel-space.org
Remove CONFIG_ namespace options from .h, moving them to defconfig, while changing non-defconfig options to CFG_ namespace.
Signed-off-by: Angelo Durgehello angelo@kernel-space.org --- configs/amcore_defconfig | 3 ++- include/configs/amcore.h | 13 +++---------- 2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig index 0b1a4e8745..e618ca0117 100644 --- a/configs/amcore_defconfig +++ b/configs/amcore_defconfig @@ -9,7 +9,7 @@ CONFIG_SYS_PROMPT="amcore $ " CONFIG_SYS_LOAD_ADDR=0x20000 CONFIG_ENV_ADDR=0xFFC1F000 CONFIG_TARGET_AMCORE=y -CONFIG_SYS_MONITOR_LEN=126976 +CONFIG_SYS_MONITOR_LEN=192512 CONFIG_SYS_MONITOR_BASE=0xFFC00400 CONFIG_BOOTDELAY=1 CONFIG_USE_BOOTCOMMAND=y @@ -17,6 +17,7 @@ CONFIG_BOOTCOMMAND="bootm ffc20000" CONFIG_SYS_CONSOLE_INFO_QUIET=y # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_MALLOC_BOOTPARAMS=y +CONFIG_SYS_BOOTPARAMS_LEN=65536 # CONFIG_CMDLINE_EDITING is not set # CONFIG_SYS_LONGHELP is not set CONFIG_SYS_PBSIZE=282 diff --git a/include/configs/amcore.h b/include/configs/amcore.h index 35f09b47e8..ca8d17bfd2 100644 --- a/include/configs/amcore.h +++ b/include/configs/amcore.h @@ -11,12 +11,10 @@ #define CFG_SYS_UART_PORT 0
#define CFG_MCFTMR -#define CONFIG_MCFUART -#define CONFIG_SYS_UART_PORT 0 -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#define CFG_SYS_UART_PORT 0 +#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-#define CONFIG_BOOTCOMMAND "bootm ffc30000" -#define CONFIG_EXTRA_ENV_SETTINGS \ +#define CFG_EXTRA_ENV_SETTINGS \ "upgrade_uboot=loady; " \ "protect off 0xffc00000 0xffc2ffff; " \ "erase 0xffc00000 0xffc2ffff; " \ @@ -43,11 +41,6 @@
/* amcore design has flash data bytes wired swapped */ #define CFG_SYS_WRITE_SWAPPED_DATA -/* reserve 128-4KB */ -#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_FLASH_BASE + 0x400) -#define CONFIG_SYS_MONITOR_LEN ((192 - 4) * 1024) -#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) -#define CONFIG_SYS_BOOTPARAMS_LEN (64 * 1024)
#define LDS_BOARD_TEXT \ . = DEFINED(env_offset) ? env_offset : .; \