Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

board: MCR3000: cleanup config

Browse Source 
Some config is redundant with Kconfig. Fix it.
Also remove unused configs
Move SDRAM_MAX_SIZE in the only place it is used

include/environment.h already defines CONFIG_ENV_SIZE
from CONFIG_ENV_SECT_SIZE and defines CONFIG_ENV_ADDR as
(CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)

remove BOOTARGS as bootargs is set by the different boot commands

Fix CONFIG_SYS_INIT_RAM_ADDR and CONFIG_SYS_INIT_RAM_SIZE to be in
line with CPM DPRAM organisation

Remove CONFIG_SYS_GBL_DATA_SIZE, CONFIG_SYS_GBL_DATA_OFFSET and
CONFIG_SYS_INIT_SP_OFFSET which are unused

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
master
Christophe Leroy 7 years ago committed by Tom Rini
parent 3949d2a716
commit b3ede33170
4 changed files with 8 additions and 33 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      arch/powerpc/Kconfig
  2. 2
      board/cssi/MCR3000/MCR3000.c
  3. 4
      configs/MCR3000_defconfig
  4. 34
      include/configs/MCR3000.h

1
arch/powerpc/Kconfig
Unescape View File

@ -32,6 +32,7 @@ config MPC86xx
config MPC8xx config MPC8xx
bool "MPC8xx" bool "MPC8xx"
select BOARD_EARLY_INIT_F
imply CMD_REGINFO imply CMD_REGINFO
endchoice endchoice

2
board/cssi/MCR3000/MCR3000.c
Unescape View File

@ -16,6 +16,8 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#define SDRAM_MAX_SIZE (32 * 1024 * 1024)
static const uint cs1_dram_table_66[] = { static const uint cs1_dram_table_66[] = {
/* DRAM - single read. (offset 0 in upm RAM) */ /* DRAM - single read. (offset 0 in upm RAM) */
0x0F3DFC04, 0x0FEFBC04, 0x00BE7804, 0x0FFDF400, 0x0F3DFC04, 0x0FEFBC04, 0x00BE7804, 0x0FFDF400,

4
configs/MCR3000_defconfig
Unescape View File

@ -39,8 +39,6 @@ CONFIG_SYS_OR7_PRELIM=0xFFFF810A
CONFIG_SYS_IMMR=0xFF000000 CONFIG_SYS_IMMR=0xFF000000
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
CONFIG_BOOTDELAY=5 CONFIG_BOOTDELAY=5
CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="ubi.mtd=4 root=ubi0:rootfs rw rootfstype=ubifs rootflags=sync console=ttyCPM0,115200N8 ip=${ipaddr}:::${netmask}:mcr3k:eth0:off"
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
# CONFIG_AUTO_COMPLETE is not set # CONFIG_AUTO_COMPLETE is not set
CONFIG_SYS_PROMPT="S3K> " CONFIG_SYS_PROMPT="S3K> "
@ -71,3 +69,5 @@ CONFIG_MPC8XX_FEC=y
CONFIG_SHA256=y CONFIG_SHA256=y
CONFIG_LZMA=y CONFIG_LZMA=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run flashboot"

34
include/configs/MCR3000.h
Unescape View File

@ -9,7 +9,6 @@
#define __CONFIG_H #define __CONFIG_H
/* High Level Configuration Options */ /* High Level Configuration Options */
#define CONFIG_BOARD_EARLY_INIT_F 1 /* Call board_early_init_f */
#define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */ #define CONFIG_MISC_INIT_R 1 /* Call misc_init_r */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
@ -55,25 +54,16 @@
"${ofl_args}; " \ "${ofl_args}; " \
"bootm ${loadaddr} - 0xf00000\0" "bootm ${loadaddr} - 0xf00000\0"
#define CONFIG_BOOTDELAY 5
#define CONFIG_IPADDR 192.168.0.3 #define CONFIG_IPADDR 192.168.0.3
#define CONFIG_SERVERIP 192.168.0.1 #define CONFIG_SERVERIP 192.168.0.1
#define CONFIG_NETMASK 255.0.0.0 #define CONFIG_NETMASK 255.0.0.0
#define CONFIG_BOOTCOMMAND "run flashboot"
#define CONFIG_LOADS_ECHO 1 /* echo on for serial download */ #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
#undef CONFIG_LOADS_BAUD_CHANGE /* don't allow baudrate change */
#define CONFIG_WATCHDOG 1 /* watchdog enabled */ #define CONFIG_WATCHDOG 1 /* watchdog enabled */
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */
#ifdef CONFIG_HUSH_PARSER
#define CONFIG_SYS_PROMPT_HUSH_PS2 "S3K> "
#endif
#define CONFIG_SYS_MEMTEST_START 0x00002000 #define CONFIG_SYS_MEMTEST_START 0x00002000
#define CONFIG_SYS_MEMTEST_END 0x00800000 #define CONFIG_SYS_MEMTEST_END 0x00800000
@ -82,16 +72,11 @@
#define CONFIG_SYS_HZ 1000 #define CONFIG_SYS_HZ 1000
/* Definitions for initial stack pointer and data area (in DPRAM) */ /* Definitions for initial stack pointer and data area (in DPRAM) */
#define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_IMMR #define CONFIG_SYS_INIT_RAM_ADDR (CONFIG_SYS_IMMR + 0x2800)
#define CONFIG_SYS_INIT_RAM_SIZE 0x2f00 #define CONFIG_SYS_INIT_RAM_SIZE (0x2e00 - 0x2800)
#define CONFIG_SYS_GBL_DATA_SIZE 64
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \
CONFIG_SYS_GBL_DATA_SIZE)
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
/* RAM configuration (note that CONFIG_SYS_SDRAM_BASE must be zero) */ /* RAM configuration (note that CONFIG_SYS_SDRAM_BASE must be zero) */
#define CONFIG_SYS_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE 0x00000000
#define SDRAM_MAX_SIZE (32 * 1024 * 1024)
/* FLASH organization */ /* FLASH organization */
#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_FLASH_BASE CONFIG_SYS_TEXT_BASE
@ -116,29 +101,16 @@
/* environment is in FLASH */ /* environment is in FLASH */
#define CONFIG_ENV_SECT_SIZE (64 * 1024) #define CONFIG_ENV_SECT_SIZE (64 * 1024)
#define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE #define CONFIG_ENV_OFFSET CONFIG_SYS_MONITOR_LEN
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_OFFSET (CONFIG_ENV_ADDR - CONFIG_SYS_FLASH_BASE)
#define CONFIG_ENV_OVERWRITE 1 #define CONFIG_ENV_OVERWRITE 1
/* Cache Configuration */
#define CONFIG_SYS_CACHELINE_SIZE 16
/* Ethernet configuration part */ /* Ethernet configuration part */
#define CONFIG_SYS_DISCOVER_PHY 1 #define CONFIG_SYS_DISCOVER_PHY 1
#ifdef CONFIG_MPC8XX_FEC
#define CONFIG_MII_INIT 1 #define CONFIG_MII_INIT 1
#endif
/* NAND configuration part */ /* NAND configuration part */
#define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_NAND_MAX_CHIPS 1
#define CONFIG_SYS_NAND_BASE 0x0C000000 #define CONFIG_SYS_NAND_BASE 0x0C000000
/* Internal Definitions */
/* Boot Flags*/
#define BOOTFLAG_COLD 0x01
#define BOOTFLAG_WARM 0x02
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */

Write Preview
Loading…
Cancel
Save