1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-02-03 06:31:06 +02:00

Merge branch 'xburst' of git@projects.qi-hardware.com:openwrt-xburst into xburst

This commit is contained in:
Mirko Vogt 2010-05-02 11:53:32 +02:00
commit 5d5a4c0ede
4 changed files with 5 additions and 22 deletions

View File

@ -24,7 +24,7 @@ static void gpio_init(void)
/*
* Initialize SDRAM pins
*/
__gpio_as_sdram_32bit();
__gpio_as_sdram_16bit_4720();
/*
* Initialize LCD pins

View File

@ -159,25 +159,6 @@ do { \
__spi_write_reg1(0x05, 0x5e); \
} while (0)
#define __lcd_display_pin_init() \
do { \
__lcd_special_pin_init();\
__gpio_as_pwm();\
__lcd_set_backlight_level(8);\
} while (0)
#define __lcd_display_on() \
do { \
__lcd_set_backlight_level(8); \
__lcd_special_on();\
} while (0)
#define __lcd_display_off() \
do { \
__lcd_set_backlight_level(0); \
__lcd_special_off();\
} while (0)
#define __lcd_set_backlight_level(n)\
do { \
__gpio_as_output(LCD_RET); \

View File

@ -96,6 +96,8 @@
/*
* NAND FLASH configuration
*/
#define CONFIG_SYS_64BIT_VSPRINTF /* needed for nand_util.c */
/* NAND Boot config code */
#define JZ4740_NANDBOOT_CFG JZ4740_NANDBOOT_B8R3

View File

@ -167,7 +167,7 @@ static int nand_read_oob(int page_addr, uchar *buf, int size)
/* Send page address */
__nand_addr(page_addr & 0xff);
__nand_addr((page_addr >> 8) & 0xff);
#ifdef NAND_ROW_CYCLE == 3
#if defined NAND_ROW_CYCLE && NAND_ROW_CYCLE == 3
__nand_addr((page_addr >> 16) & 0xff);
#endif
@ -210,7 +210,7 @@ static int nand_read_page(int page_addr, uchar *dst, uchar *oobbuf)
/* Send page address */
__nand_addr(page_addr & 0xff);
__nand_addr((page_addr >> 8) & 0xff);
#if NAND_ROW_CYCLE == 3
#if defined NAND_ROW_CYCLE && NAND_ROW_CYCLE == 3
__nand_addr((page_addr >> 16) & 0xff);
#endif