mirror of
https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git
synced 2025-09-10 04:26:19 -04:00
mpc8536: fix board config file line length
Signed-off-by: Mingkai Hu <Mingkai.hu@freescale.com> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
dd9ca98f26
commit
0735570052
@ -99,7 +99,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
|
|||||||
#ifdef CONFIG_PHYS_64BIT
|
#ifdef CONFIG_PHYS_64BIT
|
||||||
#define CONFIG_SYS_CCSRBAR_PHYS 0xfffe00000ull /* physical addr of CCSRBAR */
|
#define CONFIG_SYS_CCSRBAR_PHYS 0xfffe00000ull /* physical addr of CCSRBAR */
|
||||||
#else
|
#else
|
||||||
#define CONFIG_SYS_CCSRBAR_PHYS CONFIG_SYS_CCSRBAR /* physical addr of CCSRBAR */
|
#define CONFIG_SYS_CCSRBAR_PHYS CONFIG_SYS_CCSRBAR
|
||||||
#endif
|
#endif
|
||||||
#define CONFIG_SYS_IMMR CONFIG_SYS_CCSRBAR /* PQII uses CONFIG_SYS_IMMR */
|
#define CONFIG_SYS_IMMR CONFIG_SYS_CCSRBAR /* PQII uses CONFIG_SYS_IMMR */
|
||||||
|
|
||||||
@ -190,13 +190,18 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
|
|||||||
#define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE
|
#define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define CONFIG_SYS_BR0_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000)) | BR_PS_16 | BR_V)
|
#define CONFIG_SYS_BR0_PRELIM \
|
||||||
|
(BR_PHYS_ADDR((CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000)) \
|
||||||
|
| BR_PS_16 | BR_V)
|
||||||
#define CONFIG_SYS_OR0_PRELIM 0xf8000ff7
|
#define CONFIG_SYS_OR0_PRELIM 0xf8000ff7
|
||||||
|
|
||||||
#define CONFIG_SYS_BR1_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | BR_PS_16 | BR_V)
|
#define CONFIG_SYS_BR1_PRELIM \
|
||||||
|
(BR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) \
|
||||||
|
| BR_PS_16 | BR_V)
|
||||||
#define CONFIG_SYS_OR1_PRELIM 0xf8000ff7
|
#define CONFIG_SYS_OR1_PRELIM 0xf8000ff7
|
||||||
|
|
||||||
#define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS}
|
#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000, \
|
||||||
|
CONFIG_SYS_FLASH_BASE_PHYS }
|
||||||
#define CONFIG_SYS_FLASH_QUIET_TEST
|
#define CONFIG_SYS_FLASH_QUIET_TEST
|
||||||
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */
|
#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */
|
||||||
|
|
||||||
@ -270,7 +275,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
|
|||||||
#define CONFIG_SYS_INIT_RAM_END 0x00004000 /* End of used area in RAM */
|
#define CONFIG_SYS_INIT_RAM_END 0x00004000 /* End of used area in RAM */
|
||||||
|
|
||||||
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* num bytes initial data */
|
#define CONFIG_SYS_GBL_DATA_SIZE 128 /* num bytes initial data */
|
||||||
#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
|
#define CONFIG_SYS_GBL_DATA_OFFSET \
|
||||||
|
(CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
|
||||||
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
|
#define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
|
||||||
|
|
||||||
#define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
|
#define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
|
||||||
@ -293,7 +299,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
|
|||||||
#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024)
|
#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024)
|
||||||
|
|
||||||
/* NAND flash config */
|
/* NAND flash config */
|
||||||
#define CONFIG_NAND_BR_PRELIM (BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \
|
#define CONFIG_NAND_BR_PRELIM \
|
||||||
|
(BR_PHYS_ADDR(CONFIG_SYS_NAND_BASE_PHYS) \
|
||||||
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
||||||
| BR_PS_8 /* Port Size = 8 bit */ \
|
| BR_PS_8 /* Port Size = 8 bit */ \
|
||||||
| BR_MS_FCM /* MSEL = FCM */ \
|
| BR_MS_FCM /* MSEL = FCM */ \
|
||||||
@ -310,20 +317,23 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
|
|||||||
#define CONFIG_SYS_BR2_PRELIM CONFIG_NAND_BR_PRELIM /* NAND Base Address */
|
#define CONFIG_SYS_BR2_PRELIM CONFIG_NAND_BR_PRELIM /* NAND Base Address */
|
||||||
#define CONFIG_SYS_OR2_PRELIM CONFIG_NAND_OR_PRELIM /* NAND Options */
|
#define CONFIG_SYS_OR2_PRELIM CONFIG_NAND_OR_PRELIM /* NAND Options */
|
||||||
|
|
||||||
#define CONFIG_SYS_BR4_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0x40000))\
|
#define CONFIG_SYS_BR4_PRELIM \
|
||||||
|
(BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0x40000)) \
|
||||||
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
||||||
| BR_PS_8 /* Port Size = 8 bit */ \
|
| BR_PS_8 /* Port Size = 8 bit */ \
|
||||||
| BR_MS_FCM /* MSEL = FCM */ \
|
| BR_MS_FCM /* MSEL = FCM */ \
|
||||||
| BR_V) /* valid */
|
| BR_V) /* valid */
|
||||||
#define CONFIG_SYS_OR4_PRELIM CONFIG_NAND_OR_PRELIM /* NAND Options */
|
#define CONFIG_SYS_OR4_PRELIM CONFIG_NAND_OR_PRELIM /* NAND Options */
|
||||||
#define CONFIG_SYS_BR5_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0x80000))\
|
#define CONFIG_SYS_BR5_PRELIM \
|
||||||
|
(BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0x80000)) \
|
||||||
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
||||||
| BR_PS_8 /* Port Size = 8 bit */ \
|
| BR_PS_8 /* Port Size = 8 bit */ \
|
||||||
| BR_MS_FCM /* MSEL = FCM */ \
|
| BR_MS_FCM /* MSEL = FCM */ \
|
||||||
| BR_V) /* valid */
|
| BR_V) /* valid */
|
||||||
#define CONFIG_SYS_OR5_PRELIM CONFIG_NAND_OR_PRELIM /* NAND Options */
|
#define CONFIG_SYS_OR5_PRELIM CONFIG_NAND_OR_PRELIM /* NAND Options */
|
||||||
|
|
||||||
#define CONFIG_SYS_BR6_PRELIM (BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0xc0000))\
|
#define CONFIG_SYS_BR6_PRELIM \
|
||||||
|
(BR_PHYS_ADDR((CONFIG_SYS_NAND_BASE_PHYS + 0xc0000)) \
|
||||||
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
| (2<<BR_DECC_SHIFT) /* Use HW ECC */ \
|
||||||
| BR_PS_8 /* Port Size = 8 bit */ \
|
| BR_PS_8 /* Port Size = 8 bit */ \
|
||||||
| BR_MS_FCM /* MSEL = FCM */ \
|
| BR_MS_FCM /* MSEL = FCM */ \
|
||||||
@ -625,7 +635,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
|
|||||||
#else
|
#else
|
||||||
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
|
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */
|
||||||
#endif
|
#endif
|
||||||
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */
|
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \
|
||||||
|
+ sizeof(CONFIG_SYS_PROMPT) + 16) /* Print Buffer Size */
|
||||||
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
|
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */
|
||||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
|
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */
|
||||||
#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */
|
#define CONFIG_SYS_HZ 1000 /* decrementer freq: 1ms ticks */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user