projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ macros to CONFIG_SYS
[platform/kernel/u-boot.git]
/
include
/
configs
/
at91sam9261ek.h
diff --git
a/include/configs/at91sam9261ek.h
b/include/configs/at91sam9261ek.h
index
80c3b03
..
add31c9
100644
(file)
--- a/
include/configs/at91sam9261ek.h
+++ b/
include/configs/at91sam9261ek.h
@@
-31,7
+31,7
@@
#define AT91_CPU_NAME "AT91SAM9261"
#define AT91_MAIN_CLOCK 198656000 /* from 18.432 MHz crystal */
#define AT91_MASTER_CLOCK 99328000 /* peripheral = main / 2 */
#define AT91_CPU_NAME "AT91SAM9261"
#define AT91_MAIN_CLOCK 198656000 /* from 18.432 MHz crystal */
#define AT91_MASTER_CLOCK 99328000 /* peripheral = main / 2 */
-#define C
FG_HZ
1000000 /* 1us resolution */
+#define C
ONFIG_SYS_HZ
1000000 /* 1us resolution */
#define AT91_SLOW_CLOCK 32768 /* slow clock */
#define AT91_SLOW_CLOCK 32768 /* slow clock */
@@
-63,10
+63,10
@@
#undef LCD_TEST_PATTERN
#define CONFIG_LCD_INFO 1
#define CONFIG_LCD_INFO_BELOW_LOGO 1
#undef LCD_TEST_PATTERN
#define CONFIG_LCD_INFO 1
#define CONFIG_LCD_INFO_BELOW_LOGO 1
-#define C
FG_WHITE_ON_BLACK
1
+#define C
ONFIG_SYS_WHITE_ON_BLACK
1
#define CONFIG_ATMEL_LCD 1
#define CONFIG_ATMEL_LCD_BGR555 1
#define CONFIG_ATMEL_LCD 1
#define CONFIG_ATMEL_LCD_BGR555 1
-#define C
FG_CONSOLE_IS_IN_ENV
1
+#define C
ONFIG_SYS_CONSOLE_IS_IN_ENV
1
#define CONFIG_BOOTDELAY 3
#define CONFIG_BOOTDELAY 3
@@
-101,22
+101,22
@@
/* DataFlash */
#define CONFIG_HAS_DATAFLASH 1
/* DataFlash */
#define CONFIG_HAS_DATAFLASH 1
-#define C
FG_SPI_WRITE_TOUT (5*CFG
_HZ)
-#define C
FG_MAX_DATAFLASH_BANKS
2
-#define C
FG_DATAFLASH_LOGIC_ADDR_CS0
0xC0000000 /* CS0 */
-#define C
FG_DATAFLASH_LOGIC_ADDR_CS3
0xD0000000 /* CS3 */
+#define C
ONFIG_SYS_SPI_WRITE_TOUT (5*CONFIG_SYS
_HZ)
+#define C
ONFIG_SYS_MAX_DATAFLASH_BANKS
2
+#define C
ONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0
0xC0000000 /* CS0 */
+#define C
ONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3
0xD0000000 /* CS3 */
#define AT91_SPI_CLK 15000000
#define DATAFLASH_TCSS (0x1a << 16)
#define DATAFLASH_TCHS (0x1 << 24)
/* NAND flash */
#define NAND_MAX_CHIPS 1
#define AT91_SPI_CLK 15000000
#define DATAFLASH_TCSS (0x1a << 16)
#define DATAFLASH_TCHS (0x1 << 24)
/* NAND flash */
#define NAND_MAX_CHIPS 1
-#define C
FG_MAX_NAND_DEVICE
1
-#define C
FG_NAND_BASE
0x40000000
-#define C
FG_NAND_DBW_8
1
+#define C
ONFIG_SYS_MAX_NAND_DEVICE
1
+#define C
ONFIG_SYS_NAND_BASE
0x40000000
+#define C
ONFIG_SYS_NAND_DBW_8
1
/* NOR flash - no real flash on this board */
/* NOR flash - no real flash on this board */
-#define C
FG_NO_FLASH
1
+#define C
ONFIG_SYS_NO_FLASH
1
/* Ethernet */
#define CONFIG_DRIVER_DM9000 1
/* Ethernet */
#define CONFIG_DRIVER_DM9000 1
@@
-131,27
+131,27
@@
#define CONFIG_USB_OHCI_NEW 1
#define LITTLEENDIAN 1
#define CONFIG_DOS_PARTITION 1
#define CONFIG_USB_OHCI_NEW 1
#define LITTLEENDIAN 1
#define CONFIG_DOS_PARTITION 1
-#define C
FG_USB_OHCI_CPU_INIT
1
-#define C
FG_USB_OHCI_REGS_BASE
0x00500000 /* AT91SAM9261_UHP_BASE */
-#define C
FG_USB_OHCI_SLOT_NAME
"at91sam9261"
-#define C
FG_USB_OHCI_MAX_ROOT_PORTS
2
+#define C
ONFIG_SYS_USB_OHCI_CPU_INIT
1
+#define C
ONFIG_SYS_USB_OHCI_REGS_BASE
0x00500000 /* AT91SAM9261_UHP_BASE */
+#define C
ONFIG_SYS_USB_OHCI_SLOT_NAME
"at91sam9261"
+#define C
ONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS
2
#define CONFIG_USB_STORAGE 1
#define CONFIG_USB_STORAGE 1
-#define C
FG_LOAD_ADDR
0x22000000 /* load address */
+#define C
ONFIG_SYS_LOAD_ADDR
0x22000000 /* load address */
-#define C
FG_MEMTEST_START
PHYS_SDRAM
-#define C
FG_MEMTEST_END
0x23e00000
+#define C
ONFIG_SYS_MEMTEST_START
PHYS_SDRAM
+#define C
ONFIG_SYS_MEMTEST_END
0x23e00000
-#define C
FG_USE_DATAFLASH_CS0
1
-#undef C
FG
_USE_NANDFLASH
+#define C
ONFIG_SYS_USE_DATAFLASH_CS0
1
+#undef C
ONFIG_SYS
_USE_NANDFLASH
-#ifdef C
FG
_USE_DATAFLASH_CS0
+#ifdef C
ONFIG_SYS
_USE_DATAFLASH_CS0
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
/* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CONFIG_ENV_IS_IN_DATAFLASH 1
-#define C
FG_MONITOR_BASE (CFG
_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
+#define C
ONFIG_SYS_MONITOR_BASE (CONFIG_SYS
_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CONFIG_ENV_OFFSET 0x4200
#define CONFIG_ENV_OFFSET 0x4200
-#define CONFIG_ENV_ADDR (C
FG
_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_ADDR (C
ONFIG_SYS
_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET)
#define CONFIG_ENV_SIZE 0x4200
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
#define CONFIG_ENV_SIZE 0x4200
#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm"
#define CONFIG_BOOTARGS "console=ttyS0,115200 " \
@@
-159,7
+159,7
@@
"mtdparts=at91_nand:-(root) " \
"rw rootfstype=jffs2"
"mtdparts=at91_nand:-(root) " \
"rw rootfstype=jffs2"
-#else /* C
FG
_USE_NANDFLASH */
+#else /* C
ONFIG_SYS
_USE_NANDFLASH */
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
/* bootstrap + u-boot + env + linux in nandflash */
#define CONFIG_ENV_IS_IN_NAND 1
@@
-177,21
+177,21
@@
#endif
#define CONFIG_BAUDRATE 115200
#endif
#define CONFIG_BAUDRATE 115200
-#define C
FG_BAUDRATE_TABLE
{115200 , 19200, 38400, 57600, 9600 }
+#define C
ONFIG_SYS_BAUDRATE_TABLE
{115200 , 19200, 38400, 57600, 9600 }
-#define C
FG_PROMPT
"U-Boot> "
-#define C
FG_CBSIZE
256
-#define C
FG_MAXARGS
16
-#define C
FG_PBSIZE (CFG_CBSIZE + sizeof(CFG
_PROMPT) + 16)
-#define C
FG_LONGHELP
1
+#define C
ONFIG_SYS_PROMPT
"U-Boot> "
+#define C
ONFIG_SYS_CBSIZE
256
+#define C
ONFIG_SYS_MAXARGS
16
+#define C
ONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS
_PROMPT) + 16)
+#define C
ONFIG_SYS_LONGHELP
1
#define CONFIG_CMDLINE_EDITING 1
#define ROUND(A, B) (((A) + (B)) & ~((B) - 1))
/*
* Size of malloc() pool
*/
#define CONFIG_CMDLINE_EDITING 1
#define ROUND(A, B) (((A) + (B)) & ~((B) - 1))
/*
* Size of malloc() pool
*/
-#define C
FG_MALLOC_LEN
ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
-#define C
FG_GBL_DATA_SIZE
128 /* 128 bytes for initial data */
+#define C
ONFIG_SYS_MALLOC_LEN
ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
+#define C
ONFIG_SYS_GBL_DATA_SIZE
128 /* 128 bytes for initial data */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */
#define CONFIG_STACKSIZE (32*1024) /* regular stack */