mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-11 07:34:31 +00:00
versatile: config coding style cleanup
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Peter Pearse <peter.pearse@arm.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD
parent
4efb77d41f
commit
2600b8571a
1 changed files with 58 additions and 60 deletions
|
|
@ -35,24 +35,23 @@
|
|||
* High Level Configuration Options
|
||||
* (easy to change)
|
||||
*/
|
||||
#define CONFIG_ARM926EJS 1 /* This is an arm926ejs CPU core */
|
||||
#define CONFIG_ARM926EJS 1 /* This is an arm926ejs CPU core */
|
||||
#define CONFIG_VERSATILE 1 /* in Versatile Platform Board */
|
||||
#define CONFIG_ARCH_VERSATILE 1 /* Specifically, a Versatile */
|
||||
#define CONFIG_ARCH_VERSATILE 1 /* Specifically, a Versatile */
|
||||
|
||||
|
||||
#define CONFIG_SYS_MEMTEST_START 0x100000
|
||||
#define CONFIG_SYS_MEMTEST_END 0x10000000
|
||||
#define CONFIG_SYS_HZ (1000000 / 256)
|
||||
#define CONFIG_SYS_TIMERBASE 0x101E2000 /* Timer 0 and 1 base */
|
||||
#define CONFIG_SYS_MEMTEST_START 0x100000
|
||||
#define CONFIG_SYS_MEMTEST_END 0x10000000
|
||||
#define CONFIG_SYS_HZ (1000000 / 256)
|
||||
#define CONFIG_SYS_TIMERBASE 0x101E2000 /* Timer 0 and 1 base */
|
||||
|
||||
#define CONFIG_SYS_TIMER_INTERVAL 10000
|
||||
#define CONFIG_SYS_TIMER_RELOAD (CONFIG_SYS_TIMER_INTERVAL >> 4) /* Divide by 16 */
|
||||
#define CONFIG_SYS_TIMER_CTRL 0x84 /* Enable, Clock / 16 */
|
||||
#define CONFIG_SYS_TIMER_RELOAD (CONFIG_SYS_TIMER_INTERVAL >> 4)
|
||||
#define CONFIG_SYS_TIMER_CTRL 0x84 /* Enable, Clock / 16 */
|
||||
|
||||
/*
|
||||
* control registers
|
||||
*/
|
||||
#define VERSATILE_SCTL_BASE 0x101E0000 /* System controller */
|
||||
#define VERSATILE_SCTL_BASE 0x101E0000 /* System controller */
|
||||
|
||||
/*
|
||||
* System controller bit assignment
|
||||
|
|
@ -65,14 +64,15 @@
|
|||
#define VERSATILE_TIMER3_EnSel 19
|
||||
#define VERSATILE_TIMER4_EnSel 21
|
||||
|
||||
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
|
||||
#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
|
||||
#define CONFIG_SETUP_MEMORY_TAGS 1
|
||||
#define CONFIG_MISC_INIT_R 1 /* call misc_init_r during start up */
|
||||
#define CONFIG_MISC_INIT_R 1
|
||||
/*
|
||||
* Size of malloc() pool
|
||||
*/
|
||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)
|
||||
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size in bytes reserved for initial data */
|
||||
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024)
|
||||
/* size in bytes reserved for initial data */
|
||||
#define CONFIG_SYS_GBL_DATA_SIZE 128
|
||||
|
||||
/*
|
||||
* Hardware drivers
|
||||
|
|
@ -88,61 +88,57 @@
|
|||
*/
|
||||
#define CONFIG_PL011_SERIAL
|
||||
#define CONFIG_PL011_CLOCK 24000000
|
||||
#define CONFIG_PL01x_PORTS { (void *)CONFIG_SYS_SERIAL0, (void *)CONFIG_SYS_SERIAL1 }
|
||||
#define CONFIG_PL01x_PORTS \
|
||||
{(void *)CONFIG_SYS_SERIAL0, \
|
||||
(void *)CONFIG_SYS_SERIAL1 }
|
||||
#define CONFIG_CONS_INDEX 0
|
||||
|
||||
#define CONFIG_BAUDRATE 38400
|
||||
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
|
||||
#define CONFIG_BAUDRATE 38400
|
||||
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
|
||||
#define CONFIG_SYS_SERIAL0 0x101F1000
|
||||
#define CONFIG_SYS_SERIAL1 0x101F2000
|
||||
|
||||
|
||||
/*
|
||||
* Command line configuration.
|
||||
*/
|
||||
|
||||
#define CONFIG_CMD_BDI
|
||||
#define CONFIG_CMD_DHCP
|
||||
#define CONFIG_CMD_FLASH
|
||||
#define CONFIG_CMD_IMI
|
||||
#define CONFIG_CMD_MEMORY
|
||||
#define CONFIG_CMD_NET
|
||||
#define CONFIG_CMD_PING
|
||||
#define CONFIG_CMD_BDI
|
||||
#define CONFIG_CMD_MEMORY
|
||||
#define CONFIG_CMD_FLASH
|
||||
#define CONFIG_CMD_SAVEENV
|
||||
|
||||
|
||||
/*
|
||||
* BOOTP options
|
||||
*/
|
||||
#define CONFIG_BOOTP_SUBNETMASK
|
||||
#define CONFIG_BOOTP_BOOTPATH
|
||||
#define CONFIG_BOOTP_GATEWAY
|
||||
#define CONFIG_BOOTP_HOSTNAME
|
||||
#define CONFIG_BOOTP_BOOTPATH
|
||||
|
||||
#define CONFIG_BOOTP_SUBNETMASK
|
||||
|
||||
#define CONFIG_BOOTDELAY 2
|
||||
#define CONFIG_BOOTARGS "root=/dev/nfs mem=128M ip=dhcp netdev=25,0,0xf1010000,0xf1010010,eth0"
|
||||
/*#define CONFIG_BOOTCOMMAND "bootp ; bootm" */
|
||||
#define CONFIG_BOOTARGS "root=/dev/nfs mem=128M ip=dhcp "\
|
||||
"netdev=25,0,0xf1010000,0xf1010010,eth0"
|
||||
|
||||
/*
|
||||
* Static configuration when assigning fixed address
|
||||
*/
|
||||
/*#define CONFIG_NETMASK 255.255.255.0 /--* talk on MY local net */
|
||||
/*#define CONFIG_IPADDR xx.xx.xx.xx /--* static IP I currently own */
|
||||
/*#define CONFIG_SERVERIP xx.xx.xx.xx /--* current IP of my dev pc */
|
||||
#define CONFIG_BOOTFILE "/tftpboot/uImage" /* file to load */
|
||||
|
||||
#define CONFIG_BOOTFILE "/tftpboot/uImage" /* file to load */
|
||||
|
||||
/*
|
||||
* Miscellaneous configurable options
|
||||
*/
|
||||
#define CONFIG_SYS_LONGHELP /* undef to save memory */
|
||||
#define CONFIG_SYS_PROMPT "Versatile # " /* Monitor Command Prompt */
|
||||
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
|
||||
#define CONFIG_SYS_LONGHELP /* undef to save memory */
|
||||
#define CONFIG_SYS_PROMPT "Versatile # " /* Monitor Command Prompt */
|
||||
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
|
||||
/* Print Buffer Size */
|
||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
|
||||
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
|
||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
|
||||
#define CONFIG_SYS_PBSIZE \
|
||||
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
|
||||
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
|
||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
|
||||
|
||||
#define CONFIG_SYS_LOAD_ADDR 0x7fc0 /* default load address */
|
||||
|
||||
|
|
@ -151,43 +147,45 @@
|
|||
*
|
||||
* The stack sizes are set up in start.S using the settings below
|
||||
*/
|
||||
#define CONFIG_STACKSIZE (128*1024) /* regular stack */
|
||||
#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */
|
||||
#ifdef CONFIG_USE_IRQ
|
||||
#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */
|
||||
#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */
|
||||
#define CONFIG_STACKSIZE_IRQ (4 * 1024) /* IRQ stack */
|
||||
#define CONFIG_STACKSIZE_FIQ (4 * 1024) /* FIQ stack */
|
||||
#endif
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* Physical Memory Map
|
||||
*/
|
||||
#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */
|
||||
#define PHYS_SDRAM_1 0x00000000 /* SDRAM Bank #1 */
|
||||
#define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
|
||||
#define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */
|
||||
#define PHYS_SDRAM_1 0x00000000 /* SDRAM Bank #1 */
|
||||
#define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
|
||||
|
||||
#define CONFIG_SYS_FLASH_BASE 0x34000000
|
||||
#define CONFIG_SYS_FLASH_BASE 0x34000000
|
||||
|
||||
/*-----------------------------------------------------------------------
|
||||
* FLASH and environment organization
|
||||
*/
|
||||
|
||||
#define VERSATILE_SYS_BASE 0x10000000
|
||||
#define VERSATILE_SYS_FLASH_OFFSET 0x4C
|
||||
#define VERSATILE_FLASHCTRL (VERSATILE_SYS_BASE + VERSATILE_SYS_FLASH_OFFSET)
|
||||
#define VERSATILE_FLASHPROG_FLVPPEN (1 << 0) /* Enable writing to flash */
|
||||
#define VERSATILE_SYS_BASE 0x10000000
|
||||
#define VERSATILE_SYS_FLASH_OFFSET 0x4C
|
||||
#define VERSATILE_FLASHCTRL \
|
||||
(VERSATILE_SYS_BASE + VERSATILE_SYS_FLASH_OFFSET)
|
||||
/* Enable writing to flash */
|
||||
#define VERSATILE_FLASHPROG_FLVPPEN (1 << 0)
|
||||
|
||||
#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */
|
||||
#define PHYS_FLASH_SIZE 0x34000000 /* 64MB */
|
||||
#define CONFIG_SYS_MAX_FLASH_BANKS 1
|
||||
#define PHYS_FLASH_SIZE 0x34000000 /* 64MB */
|
||||
/* timeout values are in ticks */
|
||||
#define CONFIG_SYS_FLASH_ERASE_TOUT (20*CONFIG_SYS_HZ) /* Timeout for Flash Erase */
|
||||
#define CONFIG_SYS_FLASH_WRITE_TOUT (20*CONFIG_SYS_HZ) /* Timeout for Flash Write */
|
||||
#define CONFIG_SYS_FLASH_ERASE_TOUT (20 * CONFIG_SYS_HZ) /* Erase Timeout */
|
||||
#define CONFIG_SYS_FLASH_WRITE_TOUT (20 * CONFIG_SYS_HZ) /* Write Timeout */
|
||||
#define CONFIG_SYS_MAX_FLASH_SECT (256)
|
||||
|
||||
#define PHYS_FLASH_1 (CONFIG_SYS_FLASH_BASE)
|
||||
#define PHYS_FLASH_1 (CONFIG_SYS_FLASH_BASE)
|
||||
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1 /* env in flash instead of CONFIG_ENV_IS_NOWHERE */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */
|
||||
#define CONFIG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
|
||||
#define CONFIG_ENV_OFFSET 0x01f00000 /* environment starts here */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1 /* env in flash */
|
||||
#define CONFIG_ENV_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */
|
||||
#define CONFIG_ENV_SIZE 0x10000 /* Size of Environment */
|
||||
#define CONFIG_ENV_OFFSET 0x01f00000 /* environment starts */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
#endif /* __CONFIG_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue