mirror of
				https://xff.cz/git/u-boot/
				synced 2025-10-31 02:15:45 +01:00 
			
		
		
		
	Nokia RX-51: Convert to CONFIG_DM_SERIAL
For CONFIG_DM_SERIAL it is required to increase CONFIG_SYS_MALLOC_F_LEN as default value is not enough for memory hungry CONFIG_DM_SERIAL code. Signed-off-by: Pali Rohár <pali@kernel.org> Tested-by: Merlijn Wajer <merlijn@wizzup.org>
This commit is contained in:
		| @@ -32,6 +32,7 @@ | |||||||
| #include <i2c.h> | #include <i2c.h> | ||||||
| #include <video.h> | #include <video.h> | ||||||
| #include <keyboard.h> | #include <keyboard.h> | ||||||
|  | #include <ns16550.h> | ||||||
| #include <asm/global_data.h> | #include <asm/global_data.h> | ||||||
| #include <asm/io.h> | #include <asm/io.h> | ||||||
| #include <asm/setup.h> | #include <asm/setup.h> | ||||||
| @@ -788,3 +789,14 @@ U_BOOT_DRVINFOS(rx51_video) = { | |||||||
| U_BOOT_DRVINFOS(rx51_kp) = { | U_BOOT_DRVINFOS(rx51_kp) = { | ||||||
| 	{ "rx51_kp" }, | 	{ "rx51_kp" }, | ||||||
| }; | }; | ||||||
|  |  | ||||||
|  | static const struct ns16550_plat rx51_serial = { | ||||||
|  | 	.base = CONFIG_SYS_NS16550_COM3, | ||||||
|  | 	.reg_shift = 2, | ||||||
|  | 	.clock = CONFIG_SYS_NS16550_CLK, | ||||||
|  | 	.fcr = UART_FCR_DEFVAL, | ||||||
|  | }; | ||||||
|  |  | ||||||
|  | U_BOOT_DRVINFOS(rx51_uart) = { | ||||||
|  | 	{ "omap_serial", &rx51_serial }, | ||||||
|  | }; | ||||||
|   | |||||||
| @@ -11,12 +11,12 @@ CONFIG_STATIC_MACH_TYPE=y | |||||||
| CONFIG_MACH_TYPE=1955 | CONFIG_MACH_TYPE=1955 | ||||||
| CONFIG_SYS_TEXT_BASE=0x80008000 | CONFIG_SYS_TEXT_BASE=0x80008000 | ||||||
| CONFIG_SYS_MALLOC_LEN=0xc0000 | CONFIG_SYS_MALLOC_LEN=0xc0000 | ||||||
|  | CONFIG_SYS_MALLOC_F_LEN=0x2000 | ||||||
| CONFIG_NR_DRAM_BANKS=2 | CONFIG_NR_DRAM_BANKS=2 | ||||||
| CONFIG_TARGET_NOKIA_RX51=y | CONFIG_TARGET_NOKIA_RX51=y | ||||||
| CONFIG_SYS_LOAD_ADDR=0x80000000 | CONFIG_SYS_LOAD_ADDR=0x80000000 | ||||||
| CONFIG_OPTIMIZE_INLINING=y | CONFIG_OPTIMIZE_INLINING=y | ||||||
| CONFIG_LTO=y | CONFIG_LTO=y | ||||||
| # CONFIG_SYS_MALLOC_F is not set |  | ||||||
| # CONFIG_FIT is not set | # CONFIG_FIT is not set | ||||||
| CONFIG_SUPPORT_RAW_INITRD=y | CONFIG_SUPPORT_RAW_INITRD=y | ||||||
| CONFIG_BOOTDELAY=30 | CONFIG_BOOTDELAY=30 | ||||||
| @@ -71,8 +71,7 @@ CONFIG_DM_KEYBOARD=y | |||||||
| # CONFIG_MMC_VERBOSE is not set | # CONFIG_MMC_VERBOSE is not set | ||||||
| CONFIG_MMC_OMAP_HS=y | CONFIG_MMC_OMAP_HS=y | ||||||
| CONFIG_MTD=y | CONFIG_MTD=y | ||||||
| CONFIG_CONS_INDEX=3 | CONFIG_DM_SERIAL=y | ||||||
| CONFIG_SYS_NS16550=y |  | ||||||
| CONFIG_SPI=y | CONFIG_SPI=y | ||||||
| CONFIG_USB=y | CONFIG_USB=y | ||||||
| CONFIG_USB_MUSB_UDC=y | CONFIG_USB_MUSB_UDC=y | ||||||
|   | |||||||
| @@ -43,7 +43,6 @@ | |||||||
| #define V_NS16550_CLK		48000000		/* 48MHz (APLL96/2) */ | #define V_NS16550_CLK		48000000		/* 48MHz (APLL96/2) */ | ||||||
|  |  | ||||||
| #define CONFIG_SYS_NS16550_SERIAL | #define CONFIG_SYS_NS16550_SERIAL | ||||||
| #define CONFIG_SYS_NS16550_REG_SIZE	(-4) |  | ||||||
| #define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK | #define CONFIG_SYS_NS16550_CLK		V_NS16550_CLK | ||||||
|  |  | ||||||
| /* | /* | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user