mirror of
https://github.com/u-boot/u-boot.git
synced 2024-12-02 09:03:27 +08:00
microblaze: Fix microblaze-generic config file
1. Fix preprocessor statements 2. Clean coding style Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Michal Simek
parent
c82a541d47
commit
4aecfb1602
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* (C) Copyright 2007-2008 Michal Simek
|
||||
* (C) Copyright 2007-2010 Michal Simek
|
||||
*
|
||||
* Michal SIMEK <monstr@monstr.eu>
|
||||
*
|
||||
@ -27,31 +27,33 @@
|
||||
|
||||
#include "../board/xilinx/microblaze-generic/xparameters.h"
|
||||
|
||||
#define CONFIG_MICROBLAZE 1 /* MicroBlaze CPU */
|
||||
/* MicroBlaze CPU */
|
||||
#define CONFIG_MICROBLAZE 1
|
||||
#define MICROBLAZE_V5 1
|
||||
|
||||
/* uart */
|
||||
#ifdef XILINX_UARTLITE_BASEADDR
|
||||
#define CONFIG_XILINX_UARTLITE
|
||||
#define CONFIG_SERIAL_BASE XILINX_UARTLITE_BASEADDR
|
||||
#define CONFIG_BAUDRATE XILINX_UARTLITE_BAUDRATE
|
||||
#define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE }
|
||||
#define CONSOLE_ARG "console=console=ttyUL0,115200\0"
|
||||
# define CONFIG_XILINX_UARTLITE
|
||||
# define CONFIG_SERIAL_BASE XILINX_UARTLITE_BASEADDR
|
||||
# define CONFIG_BAUDRATE XILINX_UARTLITE_BAUDRATE
|
||||
# define CONFIG_SYS_BAUDRATE_TABLE { CONFIG_BAUDRATE }
|
||||
# define CONSOLE_ARG "console=console=ttyUL0,115200\0"
|
||||
#elif XILINX_UART16550_BASEADDR
|
||||
#define CONFIG_SYS_NS16550 1
|
||||
#define CONFIG_SYS_NS16550_SERIAL
|
||||
#define CONFIG_SYS_NS16550_REG_SIZE -4
|
||||
#define CONFIG_CONS_INDEX 1
|
||||
#define CONFIG_SYS_NS16550_COM1 (XILINX_UART16550_BASEADDR + 0x1000 + 0x3)
|
||||
#define CONFIG_SYS_NS16550_CLK XILINX_UART16550_CLOCK_HZ
|
||||
#define CONFIG_BAUDRATE 115200
|
||||
# define CONFIG_SYS_NS16550 1
|
||||
# define CONFIG_SYS_NS16550_SERIAL
|
||||
# define CONFIG_SYS_NS16550_REG_SIZE -4
|
||||
# define CONFIG_CONS_INDEX 1
|
||||
# define CONFIG_SYS_NS16550_COM1 \
|
||||
(XILINX_UART16550_BASEADDR + 0x1000 + 0x3)
|
||||
# define CONFIG_SYS_NS16550_CLK XILINX_UART16550_CLOCK_HZ
|
||||
# define CONFIG_BAUDRATE 115200
|
||||
|
||||
/* The following table includes the supported baudrates */
|
||||
#define CONFIG_SYS_BAUDRATE_TABLE \
|
||||
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
|
||||
#define CONSOLE_ARG "console=console=ttyS0,115200\0"
|
||||
/* The following table includes the supported baudrates */
|
||||
# define CONFIG_SYS_BAUDRATE_TABLE \
|
||||
{300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400}
|
||||
# define CONSOLE_ARG "console=console=ttyS0,115200\0"
|
||||
#else
|
||||
#error Undefined uart
|
||||
# error Undefined uart
|
||||
#endif
|
||||
|
||||
/* setting reset address */
|
||||
@ -59,41 +61,41 @@
|
||||
|
||||
/* ethernet */
|
||||
#ifdef XILINX_EMACLITE_BASEADDR
|
||||
#define CONFIG_XILINX_EMACLITE 1
|
||||
#define CONFIG_SYS_ENET
|
||||
# define CONFIG_XILINX_EMACLITE 1
|
||||
# define CONFIG_SYS_ENET
|
||||
#elif XILINX_LLTEMAC_BASEADDR
|
||||
#define CONFIG_XILINX_LL_TEMAC 1
|
||||
#define CONFIG_SYS_ENET
|
||||
# define CONFIG_XILINX_LL_TEMAC 1
|
||||
# define CONFIG_SYS_ENET
|
||||
#endif
|
||||
|
||||
#undef ET_DEBUG
|
||||
|
||||
/* gpio */
|
||||
#ifdef XILINX_GPIO_BASEADDR
|
||||
#define CONFIG_SYS_GPIO_0 1
|
||||
#define CONFIG_SYS_GPIO_0_ADDR XILINX_GPIO_BASEADDR
|
||||
# define CONFIG_SYS_GPIO_0 1
|
||||
# define CONFIG_SYS_GPIO_0_ADDR XILINX_GPIO_BASEADDR
|
||||
#endif
|
||||
|
||||
/* interrupt controller */
|
||||
#ifdef XILINX_INTC_BASEADDR
|
||||
#define CONFIG_SYS_INTC_0 1
|
||||
#define CONFIG_SYS_INTC_0_ADDR XILINX_INTC_BASEADDR
|
||||
#define CONFIG_SYS_INTC_0_NUM XILINX_INTC_NUM_INTR_INPUTS
|
||||
# define CONFIG_SYS_INTC_0 1
|
||||
# define CONFIG_SYS_INTC_0_ADDR XILINX_INTC_BASEADDR
|
||||
# define CONFIG_SYS_INTC_0_NUM XILINX_INTC_NUM_INTR_INPUTS
|
||||
#endif
|
||||
|
||||
/* timer */
|
||||
#ifdef XILINX_TIMER_BASEADDR
|
||||
#if (XILINX_TIMER_IRQ != -1)
|
||||
#define CONFIG_SYS_TIMER_0 1
|
||||
#define CONFIG_SYS_TIMER_0_ADDR XILINX_TIMER_BASEADDR
|
||||
#define CONFIG_SYS_TIMER_0_IRQ XILINX_TIMER_IRQ
|
||||
#define FREQUENCE XILINX_CLOCK_FREQ
|
||||
#define CONFIG_SYS_TIMER_0_PRELOAD ( FREQUENCE/1000 )
|
||||
#endif
|
||||
# if (XILINX_TIMER_IRQ != -1)
|
||||
# define CONFIG_SYS_TIMER_0 1
|
||||
# define CONFIG_SYS_TIMER_0_ADDR XILINX_TIMER_BASEADDR
|
||||
# define CONFIG_SYS_TIMER_0_IRQ XILINX_TIMER_IRQ
|
||||
# define FREQUENCE XILINX_CLOCK_FREQ
|
||||
# define CONFIG_SYS_TIMER_0_PRELOAD ( FREQUENCE/1000 )
|
||||
# endif
|
||||
#elif XILINX_CLOCK_FREQ
|
||||
#define CONFIG_XILINX_CLOCK_FREQ XILINX_CLOCK_FREQ
|
||||
# define CONFIG_XILINX_CLOCK_FREQ XILINX_CLOCK_FREQ
|
||||
#else
|
||||
#error BAD CLOCK FREQ
|
||||
# error BAD CLOCK FREQ
|
||||
#endif
|
||||
/* FSL */
|
||||
/* #define CONFIG_SYS_FSL_2 */
|
||||
@ -135,15 +137,20 @@
|
||||
/* global pointer */
|
||||
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size of global data */
|
||||
/* start of global data */
|
||||
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE - CONFIG_SYS_GBL_DATA_SIZE)
|
||||
#define CONFIG_SYS_GBL_DATA_OFFSET \
|
||||
(CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE \
|
||||
- CONFIG_SYS_GBL_DATA_SIZE)
|
||||
|
||||
/* monitor code */
|
||||
#define SIZE 0x40000
|
||||
#define SIZE 0x40000
|
||||
#define CONFIG_SYS_MONITOR_LEN (SIZE - CONFIG_SYS_GBL_DATA_SIZE)
|
||||
#define CONFIG_SYS_MONITOR_BASE (CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_MONITOR_LEN)
|
||||
#define CONFIG_SYS_MONITOR_END (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
|
||||
#define CONFIG_SYS_MONITOR_BASE \
|
||||
(CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_MONITOR_LEN)
|
||||
#define CONFIG_SYS_MONITOR_END \
|
||||
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
|
||||
#define CONFIG_SYS_MALLOC_LEN SIZE
|
||||
#define CONFIG_SYS_MALLOC_BASE (CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN)
|
||||
#define CONFIG_SYS_MALLOC_BASE \
|
||||
(CONFIG_SYS_MONITOR_BASE - CONFIG_SYS_MALLOC_LEN)
|
||||
|
||||
/* stack */
|
||||
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_MALLOC_BASE
|
||||
@ -152,55 +159,62 @@
|
||||
#define FLASH
|
||||
|
||||
#ifdef FLASH
|
||||
#define CONFIG_SYS_FLASH_BASE XILINX_FLASH_START
|
||||
#define CONFIG_SYS_FLASH_SIZE XILINX_FLASH_SIZE
|
||||
#define CONFIG_SYS_FLASH_CFI 1
|
||||
#define CONFIG_FLASH_CFI_DRIVER 1
|
||||
#define CONFIG_SYS_FLASH_EMPTY_INFO 1 /* ?empty sector */
|
||||
#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of memory banks */
|
||||
#define CONFIG_SYS_MAX_FLASH_SECT 512 /* max number of sectors on one chip */
|
||||
#define CONFIG_SYS_FLASH_PROTECTION /* hardware flash protection */
|
||||
# define CONFIG_SYS_FLASH_BASE XILINX_FLASH_START
|
||||
# define CONFIG_SYS_FLASH_SIZE XILINX_FLASH_SIZE
|
||||
# define CONFIG_SYS_FLASH_CFI 1
|
||||
# define CONFIG_FLASH_CFI_DRIVER 1
|
||||
/* ?empty sector */
|
||||
# define CONFIG_SYS_FLASH_EMPTY_INFO 1
|
||||
/* max number of memory banks */
|
||||
# define CONFIG_SYS_MAX_FLASH_BANKS 1
|
||||
/* max number of sectors on one chip */
|
||||
# define CONFIG_SYS_MAX_FLASH_SECT 512
|
||||
/* hardware flash protection */
|
||||
# define CONFIG_SYS_FLASH_PROTECTION
|
||||
|
||||
#ifdef RAMENV
|
||||
#define CONFIG_ENV_IS_NOWHERE 1
|
||||
#define CONFIG_ENV_SIZE 0x1000
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
|
||||
# ifdef RAMENV
|
||||
# define CONFIG_ENV_IS_NOWHERE 1
|
||||
# define CONFIG_ENV_SIZE 0x1000
|
||||
# define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
|
||||
|
||||
#else /* !RAMENV */
|
||||
#define CONFIG_ENV_IS_IN_FLASH 1
|
||||
#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K(one sector) for env */
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + (2 * CONFIG_ENV_SECT_SIZE))
|
||||
#define CONFIG_ENV_SIZE 0x20000
|
||||
#endif /* !RAMBOOT */
|
||||
# else /* !RAMENV */
|
||||
# define CONFIG_ENV_IS_IN_FLASH 1
|
||||
/* 128K(one sector) for env */
|
||||
# define CONFIG_ENV_SECT_SIZE 0x20000
|
||||
# define CONFIG_ENV_ADDR \
|
||||
(CONFIG_SYS_FLASH_BASE + (2 * CONFIG_ENV_SECT_SIZE))
|
||||
# define CONFIG_ENV_SIZE 0x20000
|
||||
# endif /* !RAMBOOT */
|
||||
#else /* !FLASH */
|
||||
/* ENV in RAM */
|
||||
#define CONFIG_SYS_NO_FLASH 1
|
||||
#define CONFIG_ENV_IS_NOWHERE 1
|
||||
#define CONFIG_ENV_SIZE 0x1000
|
||||
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
|
||||
#define CONFIG_SYS_FLASH_PROTECTION /* hardware flash protection */
|
||||
/* ENV in RAM */
|
||||
# define CONFIG_SYS_NO_FLASH 1
|
||||
# define CONFIG_ENV_IS_NOWHERE 1
|
||||
# define CONFIG_ENV_SIZE 0x1000
|
||||
# define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SIZE)
|
||||
/* hardware flash protection */
|
||||
# define CONFIG_SYS_FLASH_PROTECTION
|
||||
#endif /* !FLASH */
|
||||
|
||||
/* system ace */
|
||||
#ifdef XILINX_SYSACE_BASEADDR
|
||||
#define CONFIG_SYSTEMACE
|
||||
/* #define DEBUG_SYSTEMACE */
|
||||
#define SYSTEMACE_CONFIG_FPGA
|
||||
#define CONFIG_SYS_SYSTEMACE_BASE XILINX_SYSACE_BASEADDR
|
||||
#define CONFIG_SYS_SYSTEMACE_WIDTH XILINX_SYSACE_MEM_WIDTH
|
||||
#define CONFIG_DOS_PARTITION
|
||||
# define CONFIG_SYSTEMACE
|
||||
/* #define DEBUG_SYSTEMACE */
|
||||
# define SYSTEMACE_CONFIG_FPGA
|
||||
# define CONFIG_SYS_SYSTEMACE_BASE XILINX_SYSACE_BASEADDR
|
||||
# define CONFIG_SYS_SYSTEMACE_WIDTH XILINX_SYSACE_MEM_WIDTH
|
||||
# define CONFIG_DOS_PARTITION
|
||||
#endif
|
||||
|
||||
#if defined(XILINX_USE_ICACHE)
|
||||
#define CONFIG_ICACHE
|
||||
# define CONFIG_ICACHE
|
||||
#else
|
||||
#undef CONFIG_ICACHE
|
||||
# undef CONFIG_ICACHE
|
||||
#endif
|
||||
|
||||
#if defined(XILINX_USE_DCACHE)
|
||||
#define CONFIG_DCACHE
|
||||
# define CONFIG_DCACHE
|
||||
#else
|
||||
#undef CONFIG_DCACHE
|
||||
# undef CONFIG_DCACHE
|
||||
#endif
|
||||
|
||||
/*
|
||||
@ -222,37 +236,37 @@
|
||||
#define CONFIG_CMD_ECHO
|
||||
|
||||
#if defined(CONFIG_DCACHE) || defined(CONFIG_ICACHE)
|
||||
#define CONFIG_CMD_CACHE
|
||||
# define CONFIG_CMD_CACHE
|
||||
#else
|
||||
#undef CONFIG_CMD_CACHE
|
||||
# undef CONFIG_CMD_CACHE
|
||||
#endif
|
||||
|
||||
#ifndef CONFIG_SYS_ENET
|
||||
#undef CONFIG_CMD_NET
|
||||
# undef CONFIG_CMD_NET
|
||||
#else
|
||||
#define CONFIG_CMD_PING
|
||||
#define CONFIG_CMD_DHCP
|
||||
# define CONFIG_CMD_PING
|
||||
# define CONFIG_CMD_DHCP
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_SYSTEMACE)
|
||||
#define CONFIG_CMD_EXT2
|
||||
#define CONFIG_CMD_FAT
|
||||
# define CONFIG_CMD_EXT2
|
||||
# define CONFIG_CMD_FAT
|
||||
#endif
|
||||
|
||||
#if defined(FLASH)
|
||||
#define CONFIG_CMD_ECHO
|
||||
#define CONFIG_CMD_FLASH
|
||||
#define CONFIG_CMD_IMLS
|
||||
#define CONFIG_CMD_JFFS2
|
||||
# define CONFIG_CMD_ECHO
|
||||
# define CONFIG_CMD_FLASH
|
||||
# define CONFIG_CMD_IMLS
|
||||
# define CONFIG_CMD_JFFS2
|
||||
|
||||
#if !defined(RAMENV)
|
||||
#define CONFIG_CMD_SAVEENV
|
||||
#define CONFIG_CMD_SAVES
|
||||
#endif
|
||||
# if !defined(RAMENV)
|
||||
# define CONFIG_CMD_SAVEENV
|
||||
# define CONFIG_CMD_SAVES
|
||||
# endif
|
||||
#else
|
||||
#undef CONFIG_CMD_IMLS
|
||||
#undef CONFIG_CMD_FLASH
|
||||
#undef CONFIG_CMD_JFFS2
|
||||
# undef CONFIG_CMD_IMLS
|
||||
# undef CONFIG_CMD_FLASH
|
||||
# undef CONFIG_CMD_JFFS2
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_CMD_JFFS2)
|
||||
@ -270,11 +284,16 @@
|
||||
|
||||
/* Miscellaneous configurable options */
|
||||
#define CONFIG_SYS_PROMPT "U-Boot-mONStR> "
|
||||
#define CONFIG_SYS_CBSIZE 512 /* size of console buffer */
|
||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) /* print buffer size */
|
||||
#define CONFIG_SYS_MAXARGS 15 /* max number of command args */
|
||||
/* size of console buffer */
|
||||
#define CONFIG_SYS_CBSIZE 512
|
||||
/* print buffer size */
|
||||
#define CONFIG_SYS_PBSIZE \
|
||||
(CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
|
||||
/* max number of command args */
|
||||
#define CONFIG_SYS_MAXARGS 15
|
||||
#define CONFIG_SYS_LONGHELP
|
||||
#define CONFIG_SYS_LOAD_ADDR XILINX_RAM_START /* default load address */
|
||||
/* default load address */
|
||||
#define CONFIG_SYS_LOAD_ADDR XILINX_RAM_START
|
||||
|
||||
#define CONFIG_BOOTDELAY -1 /* -1 disables auto-boot */
|
||||
#define CONFIG_BOOTARGS "root=romfs"
|
||||
@ -291,7 +310,7 @@
|
||||
|
||||
#define CONFIG_PREBOOT "echo U-BOOT for ${hostname};setenv preboot;echo"
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" /* hardware flash protection */\
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS "unlock=yes\0" \
|
||||
"nor0=flash-0\0"\
|
||||
"mtdparts=mtdparts=flash-0:"\
|
||||
"256k(u-boot),256k(env),3m(kernel),"\
|
||||
@ -302,7 +321,7 @@
|
||||
/* Use the HUSH parser */
|
||||
#define CONFIG_SYS_HUSH_PARSER
|
||||
#ifdef CONFIG_SYS_HUSH_PARSER
|
||||
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
|
||||
# define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
|
||||
#endif
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user